Merge pull request #41 from FinnStutzenstein/agenda-docx-nginx-fix

emanuelschuetze · web-flow · commit 645f7e4e47d2 · 2018-03-09T16:35:24.000+01:00
Added agenda docxtemplate url to the nginx whitelist
diff --git a/roles/openslides-add-instance/templates/nginx_instance_subdomain.conf.j2 b/roles/openslides-add-instance/templates/nginx_instance_subdomain.conf.j2
@@ -21,7 +21,7 @@ server {
     ssl_certificate_key  /etc/ssl/private/openslides-container-cert.key;
 
 
-    location ~* ^/(?!ws|wss|webclient|core/servertime|core/version|users/whoami|users/login|users/logout|users/setpassword|motions/docxtemplate|projector|real-projector|static|media|rest).*$ {
+    location ~* ^/(?!ws|wss|webclient|core/servertime|core/version|users/whoami|users/login|users/logout|users/setpassword|motions/docxtemplate|agenda/docxtemplate|projector|real-projector|static|media|rest).*$ {
         rewrite ^.*$ /static/templates/index.html;
     }
 
diff --git a/roles/openslides-add-instance/templates/nginx_instance_subdomain_nossl.conf.j2 b/roles/openslides-add-instance/templates/nginx_instance_subdomain_nossl.conf.j2
@@ -3,7 +3,7 @@ server {
 
     server_name {{ openslides_instance_slug }}.{{ openslides_instance_parent_domain }};
 
-    location ~* ^/(?!ws|wss|webclient|core/servertime|core/version|users/whoami|users/login|users/logout|users/setpassword|motions/docxtemplate|projector|real-projector|static|media|rest).*$ {
+    location ~* ^/(?!ws|wss|webclient|core/servertime|core/version|users/whoami|users/login|users/logout|users/setpassword|motions/docxtemplate|agenda/docxtemplate|projector|real-projector|static|media|rest).*$ {
         rewrite ^.*$ /static/templates/index.html;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ server {`
`21`	`21`	`ssl_certificate_key /etc/ssl/private/openslides-container-cert.key;`
`22`	`22`
`23`	`23`
`24`		`- location ~* ^/(?!ws\|wss\|webclient\|core/servertime\|core/version\|users/whoami\|users/login\|users/logout\|users/setpassword\|motions/docxtemplate\|projector\|real-projector\|static\|media\|rest).*$ {`
	`24`	`+ location ~* ^/(?!ws\|wss\|webclient\|core/servertime\|core/version\|users/whoami\|users/login\|users/logout\|users/setpassword\|motions/docxtemplate\|agenda/docxtemplate\|projector\|real-projector\|static\|media\|rest).*$ {`
`25`	`25`	`rewrite ^.*$ /static/templates/index.html;`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ server {`
`3`	`3`
`4`	`4`	`server_name {{ openslides_instance_slug }}.{{ openslides_instance_parent_domain }};`
`5`	`5`
`6`		`- location ~* ^/(?!ws\|wss\|webclient\|core/servertime\|core/version\|users/whoami\|users/login\|users/logout\|users/setpassword\|motions/docxtemplate\|projector\|real-projector\|static\|media\|rest).*$ {`
	`6`	`+ location ~* ^/(?!ws\|wss\|webclient\|core/servertime\|core/version\|users/whoami\|users/login\|users/logout\|users/setpassword\|motions/docxtemplate\|agenda/docxtemplate\|projector\|real-projector\|static\|media\|rest).*$ {`
`7`	`7`	`rewrite ^.*$ /static/templates/index.html;`
`8`	`8`	`}`
`9`	`9`