v7.0.3 (#160)

Minor updates * Ensure global config during init * Run ssl-init for all domains after auto-adding from environment variables
bfren · Sep 19, 2023 · 7a15cbf · 7a15cbf
1 parent 5f795bc
commit 7a15cbf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.0.2
+7.0.3
diff --git a/overlay/etc/bf/init.d/21-ssl-conf b/overlay/etc/bf/init.d/21-ssl-conf
@@ -5,7 +5,7 @@ export BF_E=`basename ${0}`
 
 
 #======================================================================================================================
-# Generate SSL configuration file.
+# Generate Nginx SSL configuration file.
 #======================================================================================================================
 
 if [ "${PROXY_HARDEN}" = "1" ] ; then

diff --git a/overlay/etc/bf/init.d/22-ssl-init b/overlay/etc/bf/init.d/22-ssl-init
@@ -34,11 +34,16 @@ if [ ! -f "${PROXY_SSL_CONF}" ] && [ -n "${PROXY_AUTO_PRIMARY-}" ] && [ -n "${PR
     # if there are aliases enable canonical redirection
     [[ -n "${PROXY_AUTO_ALIASES-}" ]] && bf-env "PROXY_SSL_REDIRECT_TO_CANONICAL" "1"
 
-fi
+    # initialise all domains (proxy plus auto)
+    ssl-init -a
 
 
 #======================================================================================================================
-# Run initialisation script for the proxy domain.
+# Run initialisation script only for the proxy domain.
 #======================================================================================================================
 
-ssl-init -d "proxy"
+else
+
+    ssl-init -d "proxy"
+
+fi
diff --git a/overlay/usr/lib/bf/proxy/init b/overlay/usr/lib/bf/proxy/init
@@ -14,10 +14,20 @@ source ${BF_INC}/proxy-check.sh
 
 source ${BF_INC}/proxy-init-domain.sh
 source ${BF_INC}/proxy-replace.sh
+source ${BF_INC}/proxy-setup-global.sh
 source ${BF_INC}/proxy-setup-nginx.sh
 source ${BF_INC}/proxy-setup-ssl.sh
 
 
+#======================================================================================================================
+# Set up global SSL configuration.
+#======================================================================================================================
+
+bf-echo "Setting up getssl..." "proxy/init"
+setup-global
+bf-done "proxy/init"
+
+
 #======================================================================================================================
 # Initialise Nginx and SSL for requested domain.
 #======================================================================================================================