enable xsendfile and fix #26

timlegge · May 5, 2020 · 77d8aa8 · 77d8aa8 · rogeriomachado666 · May 7, 2020
1 parent 460b40d
commit 77d8aa8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/Dockerfile b/Dockerfile
@@ -134,6 +134,11 @@ RUN cd /var/www/foswiki && \
     rm -fr /var/www/foswiki/working/configure/download/* && \
     rm -fr /var/www/foswiki/working/configure/backup/*
 
+RUN cd /var/www/foswiki && \
+    tools/configure -save -set {PermittedRedirectHostUrls}='http://docker-foswiki.local:8765,https://docker-foswiki.local:8443' && \
+    tools/configure -save -set {XSendFileContrib}{Header}='X-Accel-Redirect' && \
+    tools/configure -save -set {XSendFileContrib}{Location}='/files'
+
 RUN mkdir -p /run/nginx && \
     mkdir -p /etc/nginx/conf.d
 

diff --git a/https/nginx.default.conf b/https/nginx.default.conf
@@ -57,13 +57,10 @@ server {
 
     # any other static files need to be sanctioned by the foswiki backened
     location /pub {
-        root $foswiki_root;
-        rewrite ^/pub/(.*)$ /bin/viewfile/$1;
-        # or by XSendFileContrib using
-        #
+        # The following setting must be in LocalSite.cfg
         # {XSendFileContrib}{Header} = 'X-Accel-Redirect';
         # {XSendFileContrib}{Location} = '/files';
-        #rewrite ^/pub/(.*)$ /bin/xsendfile/$1;
+        rewrite ^/pub/(.*)$ /bin/xsendfile/$1;
     }
 
     # internal location that sendfile serves sanctioned static files from

diff --git a/nginx.default.conf b/nginx.default.conf
@@ -44,13 +44,10 @@ server {
 
     # any other static files need to be sanctioned by the foswiki backened
     location /pub {
-        root $foswiki_root;
-        rewrite ^/pub/(.*)$ /bin/viewfile/$1;
-        # or by XSendFileContrib using
-        #
+        # The following setting must be in LocalSite.cfg
         # {XSendFileContrib}{Header} = 'X-Accel-Redirect';
         # {XSendFileContrib}{Location} = '/files';
-        #rewrite ^/pub/(.*)$ /bin/xsendfile/$1;
+        rewrite ^/pub/(.*)$ /bin/xsendfile/$1;
     }
 
     # internal location that sendfile serves sanctioned static files from