Release 6.4.6 - See CHANGELOG.md

tiredofit · Nov 10, 2023 · 074ffa1 · 074ffa1
1 parent 86d4ecc
commit 074ffa1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 6.4.6 2023-11-10 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Patchup to 6.4.5
+
+
 ## 6.4.5 2023-11-09 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/install/etc/cont-init.d/10-nginx b/install/etc/cont-init.d/10-nginx
@@ -25,19 +25,22 @@ if [ ! -f "/tmp/.container/container-restart" ] ; then
     if var_true "${NGINX_ENABLE_BLOCK_BOTS}" ; then nginx_configure_blockbots ; else sed -i "\|include /etc/nginx/snippets/bot_blocker.conf;|d" /etc/nginx/nginx.conf ; fi
     nginx_configure_logging
     nginx_configure_maintenance
+
     if var_true "${NGINX_ENABLE_APPLICATION_CONFIGURATION}"; then
-        nginx_configure_site_default
-        if var_true "${NGINX_ENABLE_CREATE_SAMPLE_HTML}" ; then nginx_create_sample_html ; fi
         if [ -n "${NGINX_WEBROOT_SUFFIX}" ]; then
             _nginx_webroot_original="${NGINX_WEBROOT}"
             NGINX_WEBROOT=${NGINX_WEBROOT}${NGINX_WEBROOT_SUFFIX}
         fi
+        nginx_configure_site_default
+
         update_template "/etc/nginx/sites.available/*.conf" \
                                                             NGINX_LISTEN_PORT \
                                                             NGINX_WEBROOT
         if [ -n "${NGINX_WEBROOT_SUFFIX}" ]; then
             NGINX_WEBROOT=${_nginx_webroot_original}
         fi
+
+        if var_true "${NGINX_ENABLE_CREATE_SAMPLE_HTML}" ; then nginx_create_sample_html ; fi
         if silent grep -q '<WEBROOT>' /etc/nginx/sites.available/*.conf ; then
             print_notice "Detected Legacy templates in /etc/nginx/sites.avaialable. Please change '<WEBROOT>' to {{NGINX_WEBROOT}}"
             silent sed -i "s|<WEBROOT>|${NGINX_WEBROOT}|g" /etc/nginx/sites.available/*.conf