diff --git a/Dockerfile b/Dockerfile index d636c36..2bc1e55 100644 --- 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 index 68f32a0..3cbbb2d 100644 --- 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 index 702e5db..5027359 100644 --- 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 index bd4053b..56fea8a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.3 \ No newline at end of file +3.0.0 \ No newline at end of file diff --git a/VERSION_MAJOR b/VERSION_MAJOR index d8263ee..e440e5c 100644 --- a/VERSION_MAJOR +++ b/VERSION_MAJOR @@ -1 +1 @@ -2 \ No newline at end of file +3 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index c20c8ac..f398a20 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -2.6 \ No newline at end of file +3.0 \ No newline at end of file diff --git a/overlay/etc/bf/ch.d/20-proxy b/overlay/etc/bf/ch.d/20-proxy new file mode 100644 index 0000000..5bf7c50 --- /dev/null +++ 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/cont-init.d/20-env b/overlay/etc/bf/init.d/20-env similarity index 97% rename from overlay/etc/cont-init.d/20-env rename to overlay/etc/bf/init.d/20-env index b8a2dec..66d5d24 100644 --- a/overlay/etc/cont-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/cont-init.d/21-ssl b/overlay/etc/bf/init.d/21-ssl similarity index 96% rename from overlay/etc/cont-init.d/21-ssl rename to overlay/etc/bf/init.d/21-ssl index a3da87b..b2c06d6 100644 --- a/overlay/etc/cont-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 deleted file mode 100644 index 522b726..0000000 --- a/overlay/etc/fix-attrs.d/20-proxy +++ /dev/null @@ -1,5 +0,0 @@ -/etc/nginx/sites false www:www 0640 0750 -/etc/ssl/certs false www:www 0640 0750 -/sites true www:www 0640 0750 -/ssl true www:www 0640 0750 -/usr/local/bin/ssl-* false root:root 0500 0500 diff --git a/overlay/etc/periodic/daily/update-certs b/overlay/etc/periodic/daily/update-certs index 090bc43..2301433 100644 --- 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 index 5bcd430..330239b 100644 --- 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/local/bin/healthcheck b/overlay/usr/bin/bf/healthcheck similarity index 92% rename from overlay/usr/local/bin/healthcheck rename to overlay/usr/bin/bf/healthcheck index bb1981d..d2a905c 100644 --- a/overlay/usr/local/bin/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/local/bin/nginx-regenerate b/overlay/usr/bin/bf/nginx-regenerate similarity index 98% rename from overlay/usr/local/bin/nginx-regenerate rename to overlay/usr/bin/bf/nginx-regenerate index a958c2d..63e7d81 100644 --- a/overlay/usr/local/bin/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/local/bin/ssl-cleanup b/overlay/usr/bin/bf/ssl-cleanup similarity index 99% rename from overlay/usr/local/bin/ssl-cleanup rename to overlay/usr/bin/bf/ssl-cleanup index 63a4bae..a34d228 100644 --- a/overlay/usr/local/bin/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/local/bin/ssl-init b/overlay/usr/bin/bf/ssl-init similarity index 92% rename from overlay/usr/local/bin/ssl-init rename to overlay/usr/bin/bf/ssl-init index 74b2e0e..b913b44 100644 --- a/overlay/usr/local/bin/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/local/bin/ssl-regenerate b/overlay/usr/bin/bf/ssl-regenerate similarity index 94% rename from overlay/usr/local/bin/ssl-regenerate rename to overlay/usr/bin/bf/ssl-regenerate index 69a7663..1ca6295 100644 --- a/overlay/usr/local/bin/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/local/bin/ssl-regenerate-full b/overlay/usr/bin/bf/ssl-regenerate-full similarity index 95% rename from overlay/usr/local/bin/ssl-regenerate-full rename to overlay/usr/bin/bf/ssl-regenerate-full index 9aa04b7..129f8b0 100644 --- a/overlay/usr/local/bin/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/local/bin/ssl-request b/overlay/usr/bin/bf/ssl-request similarity index 92% rename from overlay/usr/local/bin/ssl-request rename to overlay/usr/bin/bf/ssl-request index 28821fd..40e6cb2 100644 --- a/overlay/usr/local/bin/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/local/bin/ssl-update b/overlay/usr/bin/bf/ssl-update similarity index 92% rename from overlay/usr/local/bin/ssl-update rename to overlay/usr/bin/bf/ssl-update index 3db7062..287d71b 100644 --- a/overlay/usr/local/bin/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 index 5f6dd9a..6bf8163 100644 --- 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 index 1c9f71b..bdbadd3 100644 --- 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 index afc6c12..0fbf529 100644 --- 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 index 6ac9660..46bf0cd 100644 --- 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 index 93cd74b..e6e1ae2 100644 --- 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 index 874b6e2..affa895 100644 --- 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 index 075bb70..0e1bb2a 100644 --- 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 index a35c6c2..a99cc21 100644 --- 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 index b42d9dc..20d8910 100644 --- 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}`