v3.0.0 (#69)

bfren · web-flow · commit b639d2988310 · 2022-02-11T15:15:28.000Z
Major updates
* **Breaking changes** major rewrite of S6 Overlay for v3.0.0.0 - see base image and documentation for more information

Documentation updates
* Updating copyright year to 2022
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/nginx:nginx1.20-2.5.2
+FROM bfren/nginx:nginx1.20-3.0.3
 
 ARG BF_IMAGE
 ARG BF_VERSION
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 bfren
+Copyright (c) 2020-2022 bfren
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -73,4 +73,4 @@ The image contains a handful of useful Nginx configuration 'helper' files, which
 
 ## Copyright
 
-> Copyright (c) 2021 [bfren](https://bfren.dev) (unless otherwise stated)
+> Copyright (c) 2020-2022 [bfren](https://bfren.dev) (unless otherwise stated)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.6.3
+3.0.0
diff --git a/VERSION_MAJOR b/VERSION_MAJOR
@@ -1 +1 @@
-2
+3
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-2.6
+3.0
diff --git a/overlay/etc/bf/ch.d/20-proxy b/overlay/etc/bf/ch.d/20-proxy
@@ -0,0 +1,4 @@
+/etc/nginx/sites www:www 0640 0750
+/etc/ssl/certs www:www 0640 0750
+/sites www:www 0640 0750
+/ssl www:www 0640 0750
diff --git a/overlay/etc/bf/init.d/20-env b/overlay/etc/bf/init.d/20-env
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/etc/bf/init.d/21-ssl b/overlay/etc/bf/init.d/21-ssl
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/etc/fix-attrs.d/20-proxy b/overlay/etc/fix-attrs.d/20-proxy
diff --git a/overlay/etc/periodic/daily/update-certs b/overlay/etc/periodic/daily/update-certs
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/tmp/install b/overlay/tmp/install
@@ -20,7 +20,7 @@ bf-done
 # Cleanup.
 #======================================================================================================================
 
-bf-debug "Cleaning up Nginx sites definitions."
+bf-echo "Cleaning up Nginx sites definitions."
 rm -rf /etc/nginx/sites
 bf-done
 
@@ -29,7 +29,7 @@ bf-done
 # Create and link Nginx directories.
 #======================================================================================================================
 
-bf-debug "Creating and linking Nginx directories."
+bf-echo "Creating and linking Nginx directories."
 
 mkdir /sites
 ln -s /sites /etc/nginx/sites
diff --git a/overlay/usr/bin/bf/healthcheck b/overlay/usr/bin/bf/healthcheck
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/nginx-regenerate b/overlay/usr/bin/bf/nginx-regenerate
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/ssl-cleanup b/overlay/usr/bin/bf/ssl-cleanup
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/ssl-init b/overlay/usr/bin/bf/ssl-init
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/ssl-regenerate b/overlay/usr/bin/bf/ssl-regenerate
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/ssl-regenerate-full b/overlay/usr/bin/bf/ssl-regenerate-full
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/ssl-request b/overlay/usr/bin/bf/ssl-request
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/bin/bf/ssl-update b/overlay/usr/bin/bf/ssl-update
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 set -euo pipefail
 export BF_E=`basename ${0}`
diff --git a/overlay/usr/lib/bf/inc/proxy-check.sh b/overlay/usr/lib/bf/inc/proxy-check.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 
 #======================================================================================================================
diff --git a/overlay/usr/lib/bf/inc/proxy-load-conf.sh b/overlay/usr/lib/bf/inc/proxy-load-conf.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 
 #======================================================================================================================
diff --git a/overlay/usr/lib/bf/inc/proxy-replace.sh b/overlay/usr/lib/bf/inc/proxy-replace.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 
 #======================================================================================================================
diff --git a/overlay/usr/lib/bf/inc/proxy-setup-global.sh b/overlay/usr/lib/bf/inc/proxy-setup-global.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 
 #======================================================================================================================
diff --git a/overlay/usr/lib/bf/inc/proxy-setup-nginx.sh b/overlay/usr/lib/bf/inc/proxy-setup-nginx.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 
 #======================================================================================================================
diff --git a/overlay/usr/lib/bf/inc/proxy-setup-ssl.sh b/overlay/usr/lib/bf/inc/proxy-setup-ssl.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 
 #======================================================================================================================
diff --git a/overlay/usr/lib/bf/proxy/init b/overlay/usr/lib/bf/proxy/init
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 export BF_E=`basename ${0}`
 
diff --git a/overlay/usr/lib/bf/proxy/request b/overlay/usr/lib/bf/proxy/request
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 export BF_E=`basename ${0}`
 
diff --git a/overlay/usr/lib/bf/proxy/update b/overlay/usr/lib/bf/proxy/update
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 export BF_E=`basename ${0}`
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/nginx:nginx1.20-2.5.2`
	`1`	`+FROM bfren/nginx:nginx1.20-3.0.3`
`2`	`2`
`3`	`3`	`ARG BF_IMAGE`
`4`	`4`	`ARG BF_VERSION`
Original file line number	Diff line number	Diff line change
`@@ -73,4 +73,4 @@ The image contains a handful of useful Nginx configuration 'helper' files, which`
`73`	`73`
`74`	`74`	`## Copyright`
`75`	`75`
`76`		`-> Copyright (c) 2021 [bfren](https://bfren.dev) (unless otherwise stated)`
	`76`	`+> Copyright (c) 2020-2022 [bfren](https://bfren.dev) (unless otherwise stated)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/with-contenv bash`
	`1`	`+#!/command/with-contenv bash`
`2`	`2`
`3`	`3`	`set -euo pipefail`
`4`	`4`	export BF_E=`basename ${0}`