From a3c4fac375774cf9836a950886d8d4ff4f350336 Mon Sep 17 00:00:00 2001 From: James Salter Date: Tue, 28 Sep 2021 12:15:34 +0100 Subject: [PATCH 1/4] Use custom nginx conf --- Dockerfile | 3 +++ nginx/config.d/default.conf | 46 +++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 nginx/config.d/default.conf diff --git a/Dockerfile b/Dockerfile index e62b867d38..6032156d6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,5 +33,8 @@ COPY --from=builder /src/webapp /app # Insert wasm type into Nginx mime.types file so they load correctly. RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types +# Override default nginx config +COPY /nginx/config.d/default.conf /etc/nginx/config.d/default.conf + RUN rm -rf /usr/share/nginx/html \ && ln -s /app /usr/share/nginx/html diff --git a/nginx/config.d/default.conf b/nginx/config.d/default.conf new file mode 100644 index 0000000000..638f80d124 --- /dev/null +++ b/nginx/config.d/default.conf @@ -0,0 +1,46 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + add_header Cache-Control "no-cache"; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} + From 212138b0176f0aa9d2cd5be054d587245049a1aa Mon Sep 17 00:00:00 2001 From: James Salter Date: Tue, 28 Sep 2021 13:24:44 +0100 Subject: [PATCH 2/4] Fix path --- Dockerfile | 2 +- nginx/{config.d => conf.d}/default.conf | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename nginx/{config.d => conf.d}/default.conf (100%) diff --git a/Dockerfile b/Dockerfile index 6032156d6c..601f2cdbbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ COPY --from=builder /src/webapp /app RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types # Override default nginx config -COPY /nginx/config.d/default.conf /etc/nginx/config.d/default.conf +COPY /nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf RUN rm -rf /usr/share/nginx/html \ && ln -s /app /usr/share/nginx/html diff --git a/nginx/config.d/default.conf b/nginx/conf.d/default.conf similarity index 100% rename from nginx/config.d/default.conf rename to nginx/conf.d/default.conf From b4187c61509c48418105d03de50183e5f5f9bf0d Mon Sep 17 00:00:00 2001 From: James Salter Date: Tue, 28 Sep 2021 13:24:54 +0100 Subject: [PATCH 3/4] Fix rule --- nginx/conf.d/default.conf | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nginx/conf.d/default.conf b/nginx/conf.d/default.conf index 638f80d124..b2b539bfe4 100644 --- a/nginx/conf.d/default.conf +++ b/nginx/conf.d/default.conf @@ -5,9 +5,11 @@ server { #access_log /var/log/nginx/host.access.log main; - location / { - root /usr/share/nginx/html; - index index.html index.htm; + root /usr/share/nginx/html; + index index.html index.htm; + + # Set no-cache for the index.html only so that browsers always check for a new copy of Element Web. + location = /index.html { add_header Cache-Control "no-cache"; } @@ -16,9 +18,6 @@ server { # redirect server error pages to the static page /50x.html # error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } # proxy the PHP scripts to Apache listening on 127.0.0.1:80 # From 237bc51cd16aa4e0423d6b5e57833531d7389eab Mon Sep 17 00:00:00 2001 From: James Salter Date: Tue, 28 Sep 2021 13:25:43 +0100 Subject: [PATCH 4/4] Remove commented out cruft --- nginx/conf.d/default.conf | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/nginx/conf.d/default.conf b/nginx/conf.d/default.conf index b2b539bfe4..bd2225ba4b 100644 --- a/nginx/conf.d/default.conf +++ b/nginx/conf.d/default.conf @@ -3,8 +3,6 @@ server { listen [::]:80; server_name localhost; - #access_log /var/log/nginx/host.access.log main; - root /usr/share/nginx/html; index index.html index.htm; @@ -13,33 +11,8 @@ server { add_header Cache-Control "no-cache"; } - #error_page 404 /404.html; - # redirect server error pages to the static page /50x.html # error_page 500 502 503 504 /50x.html; - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} }