v4.0.4 (#99)

bfren · web-flow · commit 0cc6729d48a7 · 2022-05-07T13:16:35.000+01:00
Minor updates
* Fixing domains configuration warning
* Supporting custom location blocks
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.0.3
+4.0.4
diff --git a/overlay/etc/bf/templates/nginx-site.conf.esh b/overlay/etc/bf/templates/nginx-site.conf.esh
@@ -96,6 +96,9 @@ server {
         include                     helpers/nginx-discworld.conf;
     }
 
+    # add optional custom location blocks
+    include                         <%= "${CUSTOM_CONF}/${DOMAIN_NAME}[.]location" %>;
+
     # returns a friendly auto-refreshing 'maintenance' page if upstream servers are not available
     include                         helpers/proxy-maintenance.conf;
 
diff --git a/overlay/usr/lib/bf/inc/proxy-check.sh b/overlay/usr/lib/bf/inc/proxy-check.sh
@@ -33,7 +33,7 @@ source ${BF_INC}/proxy-load-conf.sh
 #======================================================================================================================
 
 if [ "${#DOMAINS[*]}" = "0" ] ; then
-    bf-error "No domains have been registered for SSL - please add them to /ssl/conf.sh." "inc/proxy-check.sh"
+    bf-error "No domains have been registered for SSL - please add them to /ssl/conf.json." "inc/proxy-check.sh"
     exit 1
 fi
 

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,9 @@ server {`
`96`	`96`	`include helpers/nginx-discworld.conf;`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ # add optional custom location blocks`
	`100`	`+ include <%= "${CUSTOM_CONF}/${DOMAIN_NAME}[.]location" %>;`
	`101`	`+`
`99`	`102`	`# returns a friendly auto-refreshing 'maintenance' page if upstream servers are not available`
`100`	`103`	`include helpers/proxy-maintenance.conf;`
`101`	`104`