Subfolder location is now injected (when needed) into default.conf file.

Author: Bladedu

docker-entrypoint.sh

@@ -244,14 +244,14 @@ if [ "${NGINX_GZIP_ENABLE}" = 1 ]; then
   cp /templates/gzip.conf /etc/nginx/conf.d/gzip.conf
 fi
 
-# shellcheck disable=SC2016 # The envsubst command needs to be executed without variable expansion
-envsubst '${PHP_HOST} ${PHP_PORT} ${NGINX_ACCESS_LOG_FORMAT} ${NGINX_DEFAULT_SERVER_PORT} ${NGINX_DEFAULT_SERVER_NAME} ${NGINX_DEFAULT_ROOT} ${DEFAULT_SERVER} ${NGINX_XFRAME_OPTION_VALUE} ${NGINX_HSTS_HEADER} ${NGINX_CSP_HEADER}' < /templates/default.conf > /etc/nginx/conf.d/default.conf
-
 if [ "${NGINX_SUBFOLDER}" != 0 ]; then
-  # shellcheck disable=SC2016 # The envsubst command needs to be executed without variable expansion
-  envsubst '${PHP_HOST} ${PHP_PORT} ${NGINX_ACCESS_LOG_FORMAT} ${NGINX_DEFAULT_SERVER_PORT} ${NGINX_DEFAULT_SERVER_NAME} ${NGINX_DEFAULT_ROOT} ${NGINX_SUBFOLDER} ${NGINX_SUBFOLDER_ESCAPED} ${NGINX_XFRAME_OPTION_VALUE} ${NGINX_HSTS_HEADER}' < /templates/subfolder.conf > /etc/nginx/conf.d/default.conf
+  print "Activating subfolder configuration"
+  sed -e '/#subfolder/r /templates/subfolder.conf' -i /templates/default.conf;
 fi
 
+# shellcheck disable=SC2016 # The envsubst command needs to be executed without variable expansion
+envsubst '${PHP_HOST} ${PHP_PORT} ${NGINX_ACCESS_LOG_FORMAT} ${NGINX_DEFAULT_SERVER_PORT} ${NGINX_DEFAULT_SERVER_NAME} ${NGINX_DEFAULT_ROOT} ${DEFAULT_SERVER} ${NGINX_SUBFOLDER} ${NGINX_SUBFOLDER_ESCAPED} ${NGINX_XFRAME_OPTION_VALUE} ${NGINX_HSTS_HEADER} ${NGINX_CSP_HEADER}' < /templates/default.conf > /etc/nginx/conf.d/default.conf
+
 # Handle robots.txt and sitemap directive
 ROBOTS_PATH=${NGINX_DEFAULT_ROOT}/robots.txt
 if [ -n "${SITEMAP_URL}" ] && [ -w "${ROBOTS_PATH}" ] ; then

templates/default.conf

@@ -58,6 +58,8 @@ server {
         return 200;
     }
 
+    #subfolder
+
     location = /favicon.ico {
         expires 30d;
         # Google cloud cdn needs a Cache-Control: public header.

templates/subfolder.conf

@@ -1,56 +1,10 @@
-upstream php {
-    server ${PHP_HOST}:${PHP_PORT};
+location ~ ${NGINX_SUBFOLDER}/(.*) {
+   try_files /$1 @rewrite;
 }
 
-map $http_x_forwarded_proto $fastcgi_https {
-    default $https;
-    http '';
-    https on;
-}
-
-server {
-    access_log /var/log/nginx/access.log ${NGINX_ACCESS_LOG_FORMAT};
-
-    server_name ${NGINX_DEFAULT_SERVER_NAME};
-    listen ${NGINX_DEFAULT_SERVER_PORT};
-
-    root ${NGINX_DEFAULT_ROOT};
-    index index.php;
-
-    include fastcgi.conf;
-    #hstsheader
-    #httpsredirect
-    #securityheaders
-
-    include /etc/nginx/conf.d/fragments/*.conf;
-
-    # Just return for google gclb healthcheck.
-    if ($http_user_agent = 'GoogleHC/1.0') {
-      return 200;
-    }
-
-    location ~ ${NGINX_SUBFOLDER}/(.*) {
-       try_files /$1 @rewrite;
-    }
-
-    location @rewrite {
-        rewrite ^ /index.php;
-    }
-
-    location ~ \.php$ {
-        include fastcgi.conf;
-        fastcgi_param SCRIPT_FILENAME $request_filename;
-        fastcgi_pass php;
-    }
-
-    location ${NGINX_SUBFOLDER} {
-      if ($http_x_forwarded_proto = "https") {
-        return 301 https://$host$request_uri/;
-      }
-      return 301 http://$host$request_uri/;
-    }
-
-    location / {
-        try_files $uri/ @rewrite;
-    }
+location ${NGINX_SUBFOLDER} {
+  if ($http_x_forwarded_proto = "https") {
+    return 301 https://$host$request_uri/;
+  }
+  return 301 http://$host$request_uri/;
 }