From 17387674b8371917120550a46cb78b9842feee18 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 30 Jul 2023 01:17:57 -0500 Subject: [PATCH 01/32] standard cron Signed-off-by: Eric Nemchik --- root/defaults/crontabs/abc | 2 + root/etc/crontabs/root | 9 ----- .../s6-rc.d/init-certbot-config/run | 11 +++--- .../dependencies.d/init-fail2ban-config | 0 .../s6-rc.d/init-crontab-config/run | 22 +++++++++++ .../type | 0 .../s6-overlay/s6-rc.d/init-crontab-config/up | 1 + .../s6-rc.d/init-crontabs-config/run | 38 ------------------- .../s6-rc.d/init-crontabs-config/up | 1 - .../dependencies.d/init-crontab-config} | 0 .../contents.d/init-crontab-config} | 0 .../user/contents.d/init-crontabs-config | 0 12 files changed, 31 insertions(+), 53 deletions(-) create mode 100644 root/defaults/crontabs/abc delete mode 100644 root/etc/crontabs/root rename root/etc/s6-overlay/s6-rc.d/{init-crontabs-config => init-crontab-config}/dependencies.d/init-fail2ban-config (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/run rename root/etc/s6-overlay/s6-rc.d/{init-crontabs-config => init-crontab-config}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/up delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up rename root/etc/{crontabs/abc => s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontab-config} (100%) rename root/etc/s6-overlay/s6-rc.d/{init-nginx-config/dependencies.d/init-crontabs-config => user/contents.d/init-crontab-config} (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontabs-config diff --git a/root/defaults/crontabs/abc b/root/defaults/crontabs/abc new file mode 100644 index 0000000..a9909e3 --- /dev/null +++ b/root/defaults/crontabs/abc @@ -0,0 +1,2 @@ +# min hour day month weekday command +8 2 * * * /app/le-renew.sh >> /config/log/letsencrypt/letsencrypt.log 2>&1 diff --git a/root/etc/crontabs/root b/root/etc/crontabs/root deleted file mode 100644 index c24fea0..0000000 --- a/root/etc/crontabs/root +++ /dev/null @@ -1,9 +0,0 @@ -# do daily/weekly/monthly maintenance -# min hour day month weekday command -*/15 * * * * run-parts /etc/periodic/15min -0 * * * * run-parts /etc/periodic/hourly -0 2 * * * run-parts /etc/periodic/daily -0 3 * * 6 run-parts /etc/periodic/weekly -0 5 1 * * run-parts /etc/periodic/monthly -# renew letsencrypt certs -8 2 * * * /app/le-renew.sh >> /config/log/letsencrypt/letsencrypt.log 2>&1 diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run index 6d33344..e872e8d 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run @@ -44,6 +44,7 @@ function set_ini_value() { # ensure config files exist and has at least one value set (set_ini_value does not work on empty files) touch /config/etc/letsencrypt/cli.ini +lsiown abc:abc /config/etc/letsencrypt/cli.ini grep -qF 'agree-tos' /config/etc/letsencrypt/cli.ini || echo 'agree-tos=true' >>/config/etc/letsencrypt/cli.ini # copy dns default configs @@ -190,9 +191,9 @@ if [[ ! "${URL}" = "${ORIGURL}" ]] || REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory") fi if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then - certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true + s6-setuidgid abc certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true else - certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true + s6-setuidgid abc certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true fi rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal} fi @@ -205,9 +206,9 @@ if [[ -f "/config/keys/letsencrypt/chain.pem" ]] && { [[ "${CERTPROVIDER}" == "l echo "The cert seems to be using the old LE root cert, which is no longer valid. Deleting and revoking." REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory") if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then - certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true + s6-setuidgid abc certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true else - certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true + s6-setuidgid abc certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true fi rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal} fi @@ -340,7 +341,7 @@ if [[ ! -f "/config/keys/letsencrypt/fullchain.pem" ]]; then set_ini_value "eab-hmac-key" "${ZEROSSL_EAB_HMAC_KEY}" /config/etc/letsencrypt/cli.ini fi echo "Generating new certificate" - certbot certonly --non-interactive --renew-by-default + s6-setuidgid abc certbot certonly --non-interactive --renew-by-default if [[ ! -d /config/keys/letsencrypt ]]; then if [[ "${VALIDATION}" = "dns" ]]; then echo "ERROR: Cert does not exist! Please see the validation error above. Make sure you entered correct credentials into the ${DNSCREDENTIALFILE} file." diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/dependencies.d/init-fail2ban-config b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-fail2ban-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-crontabs-config/dependencies.d/init-fail2ban-config rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-fail2ban-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run new file mode 100644 index 0000000..c49a50c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run @@ -0,0 +1,22 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +# make folders +mkdir -p \ + /config/crontabs + +## abc +# if crontabs do not exist in config +if [[ ! -f /config/crontabs/abc ]]; then + # copy crontab from system + if crontab -l -u abc; then + crontab -l -u abc >/config/crontabs/abc + fi + + # if crontabs still do not exist in config (were not copied from system) + # copy crontab from included defaults (using -n, do not overwrite an existing file) + cp -n /defaults/crontabs/abc /config/crontabs/ +fi +# set permissions and import user crontabs +lsiown abc:abc /config/crontabs/abc +crontab -u abc /config/crontabs/abc diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up new file mode 100644 index 0000000..d354111 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-crontab-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run deleted file mode 100755 index c0bb241..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -# make folders -mkdir -p \ - /config/crontabs - -## root -# if crontabs do not exist in config -if [[ ! -f /config/crontabs/root ]]; then - # copy crontab from system - if crontab -l -u root; then - crontab -l -u root >/config/crontabs/root - fi - - # if crontabs still do not exist in config (were not copied from system) - # copy crontab from included defaults (using -n, do not overwrite an existing file) - cp -n /etc/crontabs/root /config/crontabs/ 2> >(grep -v 'cp: not replacing') -fi -# set permissions and import user crontabs -lsiown root:root /config/crontabs/root -crontab -u root /config/crontabs/root - -## abc -# if crontabs do not exist in config -if [[ ! -f /config/crontabs/abc ]]; then - # copy crontab from system - if crontab -l -u abc; then - crontab -l -u abc >/config/crontabs/abc - fi - - # if crontabs still do not exist in config (were not copied from system) - # copy crontab from included defaults (using -n, do not overwrite an existing file) - cp -n /etc/crontabs/abc /config/crontabs/ 2> >(grep -v 'cp: not replacing') -fi -# set permissions and import user crontabs -lsiown abc:abc /config/crontabs/abc -crontab -u abc /config/crontabs/abc diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up deleted file mode 100644 index 006d814..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-crontabs-config/run diff --git a/root/etc/crontabs/abc b/root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontab-config similarity index 100% rename from root/etc/crontabs/abc rename to root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontab-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontabs-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontabs-config rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontabs-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontabs-config deleted file mode 100644 index e69de29..0000000 From 269e9cdd3f533f3b647df3d12ccf3a944b89b75d Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 30 Jul 2023 09:50:18 -0500 Subject: [PATCH 02/32] Fix perms Signed-off-by: Eric Nemchik --- root/etc/s6-overlay/s6-rc.d/init-crontab-config/run | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 root/etc/s6-overlay/s6-rc.d/init-crontab-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run old mode 100644 new mode 100755 From 0b738d9ee00c0b78643fddeeafbe169b002df22c Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 31 Jul 2023 15:13:43 -0500 Subject: [PATCH 03/32] set owner of certbot folders to abc Signed-off-by: Eric Nemchik --- root/etc/s6-overlay/s6-rc.d/init-certbot-config/run | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run index e872e8d..b1c6b5c 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run @@ -29,6 +29,12 @@ if [[ "${VALIDATION}" = "dns" ]] && [[ ! "${DNSPLUGIN}" =~ ^(acmedns|aliyun|azur sleep infinity fi +# set owner of certbot's CONFIG_DIR, WORK_DIR, and LOGS_DIR to abc +lsiown -R abc \ + /etc/letsencrypt \ + /var/lib/letsencrypt \ + /var/log/letsencrypt + # set_ini_value logic: # - if the name is not found in the file, append the name=value to the end of the file # - if the name is found in the file, replace the value From 919b8ac152707ef510cc7c5a3b71c573a4f51890 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Fri, 18 Aug 2023 23:38:31 -0500 Subject: [PATCH 04/32] cron in base Signed-off-by: Eric Nemchik --- .../s6-rc.d/init-crontab-config/run | 22 ------------------- .../s6-rc.d/init-crontab-config/type | 1 - .../s6-overlay/s6-rc.d/init-crontab-config/up | 1 - .../dependencies.d/init-crontab-config | 0 .../dependencies.d/init-fail2ban-config | 0 .../user/contents.d/init-crontab-config | 0 6 files changed, 24 deletions(-) delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-crontab-config/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontab-config rename root/etc/s6-overlay/s6-rc.d/{init-crontab-config => init-nginx-config}/dependencies.d/init-fail2ban-config (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run deleted file mode 100755 index c49a50c..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -# make folders -mkdir -p \ - /config/crontabs - -## abc -# if crontabs do not exist in config -if [[ ! -f /config/crontabs/abc ]]; then - # copy crontab from system - if crontab -l -u abc; then - crontab -l -u abc >/config/crontabs/abc - fi - - # if crontabs still do not exist in config (were not copied from system) - # copy crontab from included defaults (using -n, do not overwrite an existing file) - cp -n /defaults/crontabs/abc /config/crontabs/ -fi -# set permissions and import user crontabs -lsiown abc:abc /config/crontabs/abc -crontab -u abc /config/crontabs/abc diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type deleted file mode 100644 index bdd22a1..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up deleted file mode 100644 index d354111..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-crontab-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontab-config b/root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontab-config deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-fail2ban-config b/root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-fail2ban-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-fail2ban-config rename to root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-fail2ban-config diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config deleted file mode 100644 index e69de29..0000000 From 7e1db9c5622c367aa20186f5199360b66a93cca5 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 19 Aug 2023 08:42:48 -0500 Subject: [PATCH 05/32] Crontabs folder created in base Signed-off-by: Eric Nemchik --- root/etc/s6-overlay/s6-rc.d/init-folders-config/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-folders-config/run b/root/etc/s6-overlay/s6-rc.d/init-folders-config/run index 87cef4e..c18da5b 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-folders-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-folders-config/run @@ -3,7 +3,7 @@ # make our folders and links mkdir -p \ - /config/{fail2ban,crontabs,dns-conf} \ + /config/{fail2ban,dns-conf} \ /config/etc/letsencrypt/renewal-hooks \ /config/log/{fail2ban,letsencrypt,nginx} \ /config/nginx/proxy-confs \ From 23728cba0b41f6cd445068a6b602c616e8645df0 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 19 Aug 2023 10:17:40 -0500 Subject: [PATCH 06/32] Move crontabs to etc Signed-off-by: Eric Nemchik --- root/{defaults => etc}/crontabs/abc | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename root/{defaults => etc}/crontabs/abc (100%) diff --git a/root/defaults/crontabs/abc b/root/etc/crontabs/abc similarity index 100% rename from root/defaults/crontabs/abc rename to root/etc/crontabs/abc From 8b49f2b0d4ba3bf772710f12c74e4abb618426b0 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 4 Nov 2023 18:36:31 -0500 Subject: [PATCH 07/32] fix chown for group Signed-off-by: Eric Nemchik --- root/etc/s6-overlay/s6-rc.d/init-certbot-config/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run index 6515f6d..c233e2c 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run @@ -32,7 +32,7 @@ if [[ "${VALIDATION}" = "dns" ]] && ! echo "${CERTBOT_DNS_AUTHENTICATORS}" | gre fi # set owner of certbot's CONFIG_DIR, WORK_DIR, and LOGS_DIR to abc -lsiown -R abc \ +lsiown -R abc:abc \ /etc/letsencrypt \ /var/lib/letsencrypt \ /var/log/letsencrypt From efdfa45f37edccebc39013449f7269eca1c0822a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 11 Nov 2023 03:21:56 +0000 Subject: [PATCH 08/32] Bot Updating Package Versions --- package_versions.txt | 100 +++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 62b7f64..9df985e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ ConfigArgParse 1.7 python PyJWT 2.8.0 python PyNamecheap 0.0.3 python PyYAML 6.0.1 python -Simple Launcher Executable 1.1.0.14 dotnet +SimpleLauncherExecutable 1.1.0.14 dotnet acme 2.7.4 python alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk @@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.28.78 python -botocore 1.31.78 python +boto3 1.28.84 python +botocore 1.31.84 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r4 apk @@ -76,7 +76,7 @@ certbot-dns-sakuracloud 2.6.0 python certbot-dns-standalone 1.1 python certbot-dns-transip 0.5.2 python certbot-dns-vultr 1.1.0 python -certbot-plugin-gandi 1.4.3 python +certbot-plugin-gandi 1.5.0 python certifi 2023.7.22 python cffi 1.16.0 python charset-normalizer 3.3.2 python @@ -109,8 +109,8 @@ gnupg-keyboxd 2.4.3-r0 apk gnupg-utils 2.4.3-r0 apk gnupg-wks-client 2.4.3-r0 apk gnutls 3.8.0-r2 apk -google-api-core 2.12.0 python -google-api-python-client 2.106.0 python +google-api-core 2.14.0 python +google-api-python-client 2.107.0 python google-auth 2.23.4 python google-auth-httplib2 0.1.1 python googleapis-common-protos 1.61.0 python @@ -236,55 +236,55 @@ pcre2 10.42-r1 apk perl 5.36.1-r2 apk perl-error 0.17029-r1 apk perl-git 2.40.1-r0 apk -php82 8.2.10-r0 apk -php82-bcmath 8.2.10-r0 apk -php82-bz2 8.2.10-r0 apk -php82-common 8.2.10-r0 apk -php82-ctype 8.2.10-r0 apk -php82-curl 8.2.10-r0 apk -php82-dom 8.2.10-r0 apk -php82-exif 8.2.10-r0 apk -php82-fileinfo 8.2.10-r0 apk -php82-fpm 8.2.10-r0 apk -php82-ftp 8.2.10-r0 apk -php82-gd 8.2.10-r0 apk -php82-gmp 8.2.10-r0 apk -php82-iconv 8.2.10-r0 apk -php82-imap 8.2.10-r0 apk -php82-intl 8.2.10-r0 apk -php82-ldap 8.2.10-r0 apk -php82-mbstring 8.2.10-r0 apk -php82-mysqli 8.2.10-r0 apk -php82-mysqlnd 8.2.10-r0 apk -php82-opcache 8.2.10-r0 apk -php82-openssl 8.2.10-r0 apk -php82-pdo 8.2.10-r0 apk -php82-pdo_mysql 8.2.10-r0 apk -php82-pdo_odbc 8.2.10-r0 apk -php82-pdo_pgsql 8.2.10-r0 apk -php82-pdo_sqlite 8.2.10-r0 apk -php82-pear 8.2.10-r0 apk +php82 8.2.12-r0 apk +php82-bcmath 8.2.12-r0 apk +php82-bz2 8.2.12-r0 apk +php82-common 8.2.12-r0 apk +php82-ctype 8.2.12-r0 apk +php82-curl 8.2.12-r0 apk +php82-dom 8.2.12-r0 apk +php82-exif 8.2.12-r0 apk +php82-fileinfo 8.2.12-r0 apk +php82-fpm 8.2.12-r0 apk +php82-ftp 8.2.12-r0 apk +php82-gd 8.2.12-r0 apk +php82-gmp 8.2.12-r0 apk +php82-iconv 8.2.12-r0 apk +php82-imap 8.2.12-r0 apk +php82-intl 8.2.12-r0 apk +php82-ldap 8.2.12-r0 apk +php82-mbstring 8.2.12-r0 apk +php82-mysqli 8.2.12-r0 apk +php82-mysqlnd 8.2.12-r0 apk +php82-opcache 8.2.12-r0 apk +php82-openssl 8.2.12-r0 apk +php82-pdo 8.2.12-r0 apk +php82-pdo_mysql 8.2.12-r0 apk +php82-pdo_odbc 8.2.12-r0 apk +php82-pdo_pgsql 8.2.12-r0 apk +php82-pdo_sqlite 8.2.12-r0 apk +php82-pear 8.2.12-r0 apk php82-pecl-apcu 5.1.22-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-mcrypt 1.0.6-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk php82-pecl-redis 6.0.2-r0 apk -php82-pgsql 8.2.10-r0 apk -php82-phar 8.2.10-r0 apk -php82-posix 8.2.10-r0 apk -php82-session 8.2.10-r0 apk -php82-simplexml 8.2.10-r0 apk -php82-soap 8.2.10-r0 apk -php82-sockets 8.2.10-r0 apk -php82-sodium 8.2.10-r0 apk -php82-sqlite3 8.2.10-r0 apk -php82-tokenizer 8.2.10-r0 apk -php82-xml 8.2.10-r0 apk -php82-xmlreader 8.2.10-r0 apk -php82-xmlwriter 8.2.10-r0 apk -php82-xsl 8.2.10-r0 apk -php82-zip 8.2.10-r0 apk +php82-pgsql 8.2.12-r0 apk +php82-phar 8.2.12-r0 apk +php82-posix 8.2.12-r0 apk +php82-session 8.2.12-r0 apk +php82-simplexml 8.2.12-r0 apk +php82-soap 8.2.12-r0 apk +php82-sockets 8.2.12-r0 apk +php82-sodium 8.2.12-r0 apk +php82-sqlite3 8.2.12-r0 apk +php82-tokenizer 8.2.12-r0 apk +php82-xml 8.2.12-r0 apk +php82-xmlreader 8.2.12-r0 apk +php82-xmlwriter 8.2.12-r0 apk +php82-xsl 8.2.12-r0 apk +php82-zip 8.2.12-r0 apk pinentry 1.2.1-r1 apk pip 23.3.1 python pkb-client 1.2 python @@ -323,7 +323,7 @@ soupsieve 2.5 python sqlite-libs 3.41.2-r2 apk ssl_client 1.36.1-r4 apk tiff 4.5.1-r0 apk -tldextract 5.0.1 python +tldextract 5.1.0 python typing-inspect 0.9.0 python typing_extensions 4.8.0 python tzdata 2023c-r1 apk From 8b0df1fcbb08335a0a6e289c8c454f6e1918d8cc Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Mon, 13 Nov 2023 16:58:13 -0500 Subject: [PATCH 09/32] install mcrypt from community repo on alpine edge --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f99b3dd..eab4093 100755 --- a/Dockerfile +++ b/Dockerfile @@ -76,7 +76,7 @@ RUN \ php82-xmlreader \ php82-xsl \ whois && \ - apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ php82-pecl-mcrypt && \ echo "**** install certbot plugins ****" && \ if [ -z ${CERTBOT_VERSION+x} ]; then \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ed628a6..a98ee69 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -76,7 +76,7 @@ RUN \ php82-xmlreader \ php82-xsl \ whois && \ - apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ php82-pecl-mcrypt && \ echo "**** install certbot plugins ****" && \ if [ -z ${CERTBOT_VERSION+x} ]; then \ From 287b952aeac12d1c56d0a95332f21f2f869ca91e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 13 Nov 2023 22:20:05 +0000 Subject: [PATCH 10/32] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9df985e..4d2b862 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.28.84 python -botocore 1.31.84 python +boto3 1.28.85 python +botocore 1.31.85 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r4 apk @@ -60,7 +60,7 @@ certbot-dns-he 1.0.0 python certbot-dns-hetzner 2.0.0 python certbot-dns-infomaniak 0.2.1 python certbot-dns-inwx 2.2.0 python -certbot-dns-ionos 2022.11.24 python +certbot-dns-ionos 2023.11.13.post1 python certbot-dns-linode 2.6.0 python certbot-dns-loopia 1.0.1 python certbot-dns-luadns 2.6.0 python @@ -139,7 +139,7 @@ libavif 0.11.1-r2 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r0 apk +libcrypto3 3.1.4-r1 apk libcurl 8.4.0-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk @@ -171,7 +171,7 @@ libsasl 2.1.28-r4 apk libseccomp 2.5.4-r2 apk libsm 1.2.4-r1 apk libsodium 1.0.18-r3 apk -libssl3 3.1.4-r0 apk +libssl3 3.1.4-r1 apk libstdc++ 12.2.1_git20220924-r10 apk libtasn1 4.19.0-r1 apk libunistring 1.1-r1 apk @@ -227,7 +227,7 @@ nginx-mod-stream-geoip2 1.24.0-r7 apk nginx-vim 1.24.0-r7 apk npth 1.6-r4 apk oniguruma 6.9.8-r1 apk -openssl 3.1.4-r0 apk +openssl 3.1.4-r1 apk p11-kit 0.24.1-r2 apk packaging 23.2 python parsedatetime 2.6 python From bd685533a2c317db979bc3185d521a9414f31b13 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 18 Nov 2023 03:17:25 +0000 Subject: [PATCH 11/32] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fb4f62..a6e7451 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relatio ## Supported Architectures -We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). Simply pulling `lscr.io/linuxserver/swag:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. From 2697b74a8ca00a6dc98646eae2abb3bfc388cc40 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 18 Nov 2023 03:21:34 +0000 Subject: [PATCH 12/32] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4d2b862..1283041 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,12 +23,12 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.28.85 python -botocore 1.31.85 python +boto3 1.29.3 python +botocore 1.32.3 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python -busybox 1.36.1-r4 apk -busybox-binsh 1.36.1-r4 apk +busybox 1.36.1-r5 apk +busybox-binsh 1.36.1-r5 apk c-client 2007f-r15 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk @@ -65,7 +65,7 @@ certbot-dns-linode 2.6.0 python certbot-dns-loopia 1.0.1 python certbot-dns-luadns 2.6.0 python certbot-dns-namecheap 1.0.0 python -certbot-dns-netcup 1.3.1 python +certbot-dns-netcup 1.4.2 python certbot-dns-njalla 1.0.0 python certbot-dns-nsone 2.6.0 python certbot-dns-ovh 2.6.0 python @@ -77,7 +77,7 @@ certbot-dns-standalone 1.1 python certbot-dns-transip 0.5.2 python certbot-dns-vultr 1.1.0 python certbot-plugin-gandi 1.5.0 python -certifi 2023.7.22 python +certifi 2023.11.17 python cffi 1.16.0 python charset-normalizer 3.3.2 python cloudflare 2.12.4 python @@ -110,7 +110,7 @@ gnupg-utils 2.4.3-r0 apk gnupg-wks-client 2.4.3-r0 apk gnutls 3.8.0-r2 apk google-api-core 2.14.0 python -google-api-python-client 2.107.0 python +google-api-python-client 2.108.0 python google-auth 2.23.4 python google-auth-httplib2 0.1.1 python googleapis-common-protos 1.61.0 python @@ -165,7 +165,7 @@ libncursesw 6.4_p20230506-r0 apk libnftnl 1.2.5-r1 apk libpanelw 6.4_p20230506-r0 apk libpng 1.6.39-r3 apk -libpq 15.4-r0 apk +libpq 15.5-r0 apk libproc2 4.0.4-r0 apk libsasl 2.1.28-r4 apk libseccomp 2.5.4-r2 apk @@ -291,7 +291,7 @@ pkb-client 1.2 python popt 1.19-r2 apk portalocker 2.8.2 python procps-ng 4.0.4-r0 apk -protobuf 4.25.0 python +protobuf 4.25.1 python publicsuffixlist 0.9.4 python pyOpenSSL 23.3.0 python pyRFC3339 1.1 python @@ -321,9 +321,9 @@ six 1.16.0 python skalibs 2.13.1.1-r1 apk soupsieve 2.5 python sqlite-libs 3.41.2-r2 apk -ssl_client 1.36.1-r4 apk +ssl_client 1.36.1-r5 apk tiff 4.5.1-r0 apk -tldextract 5.1.0 python +tldextract 5.1.1 python typing-inspect 0.9.0 python typing_extensions 4.8.0 python tzdata 2023c-r1 apk From e3560414dc749010bd1d745eb29f801f351a2d85 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 23 Nov 2023 07:50:53 -0600 Subject: [PATCH 13/32] Run certbot as root to allow fix http validation Fixes regression from https://github.com/linuxserver/docker-swag/pull/399 Signed-off-by: Eric Nemchik --- readme-vars.yml | 1 + root/etc/crontabs/{abc => root} | 0 root/etc/s6-overlay/s6-rc.d/init-certbot-config/run | 10 +++++----- 3 files changed, 6 insertions(+), 5 deletions(-) rename root/etc/crontabs/{abc => root} (100%) diff --git a/readme-vars.yml b/readme-vars.yml index 3cd4ccc..9260487 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -153,6 +153,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.11.23:", desc: "Run certbot as root to allow fix http validation." } - { date: "01.10.23:", desc: "Fix \"unrecognized arguments\" issue in DirectAdmin DNS plugin." } - { date: "28.08.23:", desc: "Add Namecheap DNS plugin." } - { date: "12.08.23:", desc: "Add FreeDNS plugin. Detect certbot DNS authenticators using CLI." } diff --git a/root/etc/crontabs/abc b/root/etc/crontabs/root similarity index 100% rename from root/etc/crontabs/abc rename to root/etc/crontabs/root diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run index c233e2c..800a806 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run @@ -199,9 +199,9 @@ if [[ ! "${URL}" = "${ORIGURL}" ]] || REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory") fi if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then - s6-setuidgid abc certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true + certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true else - s6-setuidgid abc certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true + certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true fi rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal} fi @@ -214,9 +214,9 @@ if [[ -f "/config/keys/letsencrypt/chain.pem" ]] && { [[ "${CERTPROVIDER}" == "l echo "The cert seems to be using the old LE root cert, which is no longer valid. Deleting and revoking." REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory") if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then - s6-setuidgid abc certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true + certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true else - s6-setuidgid abc certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true + certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true fi rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal} fi @@ -349,7 +349,7 @@ if [[ ! -f "/config/keys/letsencrypt/fullchain.pem" ]]; then set_ini_value "eab-hmac-key" "${ZEROSSL_EAB_HMAC_KEY}" /config/etc/letsencrypt/cli.ini fi echo "Generating new certificate" - s6-setuidgid abc certbot certonly --non-interactive --renew-by-default + certbot certonly --non-interactive --renew-by-default if [[ ! -d /config/keys/letsencrypt ]]; then if [[ "${VALIDATION}" = "dns" ]]; then echo "ERROR: Cert does not exist! Please see the validation error above. Make sure you entered correct credentials into the ${DNSCREDENTIALFILE} file." From 2ca6807b64483fdf192a5c09da4b89343c3b806a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 25 Nov 2023 03:18:43 +0000 Subject: [PATCH 14/32] Bot Updating Package Versions --- package_versions.txt | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1283041..67b0ae3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.29.3 python -botocore 1.32.3 python +boto3 1.29.6 python +botocore 1.32.6 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -65,7 +65,7 @@ certbot-dns-linode 2.6.0 python certbot-dns-loopia 1.0.1 python certbot-dns-luadns 2.6.0 python certbot-dns-namecheap 1.0.0 python -certbot-dns-netcup 1.4.2 python +certbot-dns-netcup 1.4.3 python certbot-dns-njalla 1.0.0 python certbot-dns-nsone 2.6.0 python certbot-dns-ovh 2.6.0 python @@ -122,7 +122,7 @@ gpgv 2.4.3-r0 apk httplib2 0.22.0 python icu-data-en 73.2-r2 apk icu-libs 73.2-r2 apk -idna 3.4 python +idna 3.5 python importlib-metadata 6.8.0 python ip6tables 1.8.9-r2 apk iptables 1.8.9-r2 apk @@ -182,7 +182,7 @@ libxau 1.0.11-r2 apk libxcb 1.15-r1 apk libxdmcp 1.1.4-r2 apk libxext 1.3.5-r2 apk -libxml2 2.11.4-r0 apk +libxml2 2.11.6-r0 apk libxpm 3.5.16-r1 apk libxslt 1.1.38-r0 apk libxt 1.3.0-r2 apk @@ -237,53 +237,53 @@ perl 5.36.1-r2 apk perl-error 0.17029-r1 apk perl-git 2.40.1-r0 apk php82 8.2.12-r0 apk -php82-bcmath 8.2.12-r0 apk -php82-bz2 8.2.12-r0 apk +php82-bcmath 8.2.13-r0 apk +php82-bz2 8.2.13-r0 apk php82-common 8.2.12-r0 apk php82-ctype 8.2.12-r0 apk php82-curl 8.2.12-r0 apk -php82-dom 8.2.12-r0 apk -php82-exif 8.2.12-r0 apk +php82-dom 8.2.13-r0 apk +php82-exif 8.2.13-r0 apk php82-fileinfo 8.2.12-r0 apk php82-fpm 8.2.12-r0 apk -php82-ftp 8.2.12-r0 apk -php82-gd 8.2.12-r0 apk -php82-gmp 8.2.12-r0 apk +php82-ftp 8.2.13-r0 apk +php82-gd 8.2.13-r0 apk +php82-gmp 8.2.13-r0 apk php82-iconv 8.2.12-r0 apk -php82-imap 8.2.12-r0 apk -php82-intl 8.2.12-r0 apk -php82-ldap 8.2.12-r0 apk +php82-imap 8.2.13-r0 apk +php82-intl 8.2.13-r0 apk +php82-ldap 8.2.13-r0 apk php82-mbstring 8.2.12-r0 apk -php82-mysqli 8.2.12-r0 apk -php82-mysqlnd 8.2.12-r0 apk -php82-opcache 8.2.12-r0 apk +php82-mysqli 8.2.13-r0 apk +php82-mysqlnd 8.2.13-r0 apk +php82-opcache 8.2.13-r0 apk php82-openssl 8.2.12-r0 apk -php82-pdo 8.2.12-r0 apk -php82-pdo_mysql 8.2.12-r0 apk -php82-pdo_odbc 8.2.12-r0 apk -php82-pdo_pgsql 8.2.12-r0 apk -php82-pdo_sqlite 8.2.12-r0 apk -php82-pear 8.2.12-r0 apk +php82-pdo 8.2.13-r0 apk +php82-pdo_mysql 8.2.13-r0 apk +php82-pdo_odbc 8.2.13-r0 apk +php82-pdo_pgsql 8.2.13-r0 apk +php82-pdo_sqlite 8.2.13-r0 apk +php82-pear 8.2.13-r0 apk php82-pecl-apcu 5.1.22-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-mcrypt 1.0.6-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk php82-pecl-redis 6.0.2-r0 apk -php82-pgsql 8.2.12-r0 apk +php82-pgsql 8.2.13-r0 apk php82-phar 8.2.12-r0 apk -php82-posix 8.2.12-r0 apk +php82-posix 8.2.13-r0 apk php82-session 8.2.12-r0 apk php82-simplexml 8.2.12-r0 apk -php82-soap 8.2.12-r0 apk -php82-sockets 8.2.12-r0 apk -php82-sodium 8.2.12-r0 apk -php82-sqlite3 8.2.12-r0 apk -php82-tokenizer 8.2.12-r0 apk +php82-soap 8.2.13-r0 apk +php82-sockets 8.2.13-r0 apk +php82-sodium 8.2.13-r0 apk +php82-sqlite3 8.2.13-r0 apk +php82-tokenizer 8.2.13-r0 apk php82-xml 8.2.12-r0 apk -php82-xmlreader 8.2.12-r0 apk +php82-xmlreader 8.2.13-r0 apk php82-xmlwriter 8.2.12-r0 apk -php82-xsl 8.2.12-r0 apk +php82-xsl 8.2.13-r0 apk php82-zip 8.2.12-r0 apk pinentry 1.2.1-r1 apk pip 23.3.1 python @@ -296,7 +296,7 @@ publicsuffixlist 0.9.4 python pyOpenSSL 23.3.0 python pyRFC3339 1.1 python pyacmedns 0.4 python -pyasn1 0.5.0 python +pyasn1 0.5.1 python pyasn1-modules 0.3.0 python pyc 0.1-r0 apk pycparser 2.21 python From fbe212b67c8dd255e326daa30fd4517fed0523e4 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 27 Nov 2023 18:27:05 -0600 Subject: [PATCH 15/32] Fix index.php being downloaded on 404 Signed-off-by: Eric Nemchik --- readme-vars.yml | 1 + root/defaults/nginx/site-confs/default.conf.sample | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 3cd4ccc..64c2871 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -153,6 +153,7 @@ app_setup_block: | # changelog changelogs: + - { date: "27.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404." } - { date: "01.10.23:", desc: "Fix \"unrecognized arguments\" issue in DirectAdmin DNS plugin." } - { date: "28.08.23:", desc: "Add Namecheap DNS plugin." } - { date: "12.08.23:", desc: "Add FreeDNS plugin. Detect certbot DNS authenticators using CLI." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index df852ed..9c858e0 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/06/05 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2023/11/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample # redirect all traffic to https server { @@ -48,7 +48,7 @@ server { # enable for Authentik (requires authentik-server.conf in the server block) #include /config/nginx/authentik-location.conf; - try_files $uri $uri/ /index.html /index.php$is_args$args =404; + try_files $uri $uri/ /index.html /index.php$is_args$args; } location ~ ^(.+\.php)(.*)$ { @@ -65,6 +65,7 @@ server { # enable for Authentik (requires authentik-server.conf in the server block) #include /config/nginx/authentik-location.conf; + try_files $fastcgi_script_name =404; fastcgi_split_path_info ^(.+\.php)(.*)$; fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; From 5fc5825afd618650b62deeaa84cac5e91aba9b47 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 28 Nov 2023 19:50:37 +0000 Subject: [PATCH 16/32] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a6e7451..86057ba 100644 --- a/README.md +++ b/README.md @@ -401,6 +401,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.11.23:** - Run certbot as root to allow fix http validation. * **01.10.23:** - Fix "unrecognized arguments" issue in DirectAdmin DNS plugin. * **28.08.23:** - Add Namecheap DNS plugin. * **12.08.23:** - Add FreeDNS plugin. Detect certbot DNS authenticators using CLI. From eba3c341fa00dfe0def40b5652ee24836e090670 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 28 Nov 2023 19:55:58 +0000 Subject: [PATCH 17/32] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 67b0ae3..c4e9c65 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.29.6 python -botocore 1.32.6 python +boto3 1.33.1 python +botocore 1.33.1 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -80,10 +80,10 @@ certbot-plugin-gandi 1.5.0 python certifi 2023.11.17 python cffi 1.16.0 python charset-normalizer 3.3.2 python -cloudflare 2.12.4 python +cloudflare 2.14.2 python configobj 5.0.8 python coreutils 9.3-r1 apk -cryptography 41.0.5 python +cryptography 41.0.7 python curl 8.4.0-r0 apk dataclasses-json 0.5.14 python distro 1.8.0 python @@ -122,7 +122,7 @@ gpgv 2.4.3-r0 apk httplib2 0.22.0 python icu-data-en 73.2-r2 apk icu-libs 73.2-r2 apk -idna 3.5 python +idna 3.6 python importlib-metadata 6.8.0 python ip6tables 1.8.9-r2 apk iptables 1.8.9-r2 apk @@ -233,7 +233,7 @@ packaging 23.2 python parsedatetime 2.6 python pcre 8.45-r3 apk pcre2 10.42-r1 apk -perl 5.36.1-r2 apk +perl 5.36.2-r0 apk perl-error 0.17029-r1 apk perl-git 2.40.1-r0 apk php82 8.2.12-r0 apk @@ -313,7 +313,7 @@ requests 2.31.0 python requests-file 1.5.1 python requests-mock 1.11.0 python rsa 4.9 python -s3transfer 0.7.0 python +s3transfer 0.8.0 python scanelf 1.3.7-r1 apk setuptools 65.5.0 python shadow 4.13-r4 apk @@ -331,7 +331,7 @@ unixodbc 2.3.11-r2 apk uritemplate 4.1.1 python urllib3 1.26.18 python utmps-libs 0.1.2.1-r1 apk -wheel 0.41.3 python +wheel 0.42.0 python whois 5.5.17-r0 apk xz-libs 5.4.3-r0 apk zipp 3.17.0 python From b9dd1b7c5a71c4a5f59208261b158908f0bc2f94 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 30 Nov 2023 17:33:07 -0600 Subject: [PATCH 18/32] Update readme-vars.yml --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 682b349..277c47b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -153,7 +153,7 @@ app_setup_block: | # changelog changelogs: - - { date: "27.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404." } + - { date: "30.11.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404." } - { date: "23.11.23:", desc: "Run certbot as root to allow fix http validation." } - { date: "01.10.23:", desc: "Fix \"unrecognized arguments\" issue in DirectAdmin DNS plugin." } - { date: "28.08.23:", desc: "Add Namecheap DNS plugin." } From 0061faef151a375b5fcedd049fc0f8a4802fc960 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 30 Nov 2023 23:38:22 +0000 Subject: [PATCH 19/32] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 86057ba..3fdb673 100644 --- a/README.md +++ b/README.md @@ -401,6 +401,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **30.11.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404. * **23.11.23:** - Run certbot as root to allow fix http validation. * **01.10.23:** - Fix "unrecognized arguments" issue in DirectAdmin DNS plugin. * **28.08.23:** - Add Namecheap DNS plugin. From 1abab5cb6d4eeba3695fbd9e1a56461abe180cc0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 30 Nov 2023 23:41:43 +0000 Subject: [PATCH 20/32] Bot Updating Package Versions --- package_versions.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c4e9c65..ff6bceb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.33.1 python -botocore 1.33.1 python +boto3 1.33.5 python +botocore 1.33.5 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -110,8 +110,8 @@ gnupg-utils 2.4.3-r0 apk gnupg-wks-client 2.4.3-r0 apk gnutls 3.8.0-r2 apk google-api-core 2.14.0 python -google-api-python-client 2.108.0 python -google-auth 2.23.4 python +google-api-python-client 2.109.0 python +google-auth 2.24.0 python google-auth-httplib2 0.1.1 python googleapis-common-protos 1.61.0 python gpg 2.4.3-r0 apk @@ -236,28 +236,28 @@ pcre2 10.42-r1 apk perl 5.36.2-r0 apk perl-error 0.17029-r1 apk perl-git 2.40.1-r0 apk -php82 8.2.12-r0 apk +php82 8.2.13-r0 apk php82-bcmath 8.2.13-r0 apk php82-bz2 8.2.13-r0 apk -php82-common 8.2.12-r0 apk -php82-ctype 8.2.12-r0 apk -php82-curl 8.2.12-r0 apk +php82-common 8.2.13-r0 apk +php82-ctype 8.2.13-r0 apk +php82-curl 8.2.13-r0 apk php82-dom 8.2.13-r0 apk php82-exif 8.2.13-r0 apk -php82-fileinfo 8.2.12-r0 apk -php82-fpm 8.2.12-r0 apk +php82-fileinfo 8.2.13-r0 apk +php82-fpm 8.2.13-r0 apk php82-ftp 8.2.13-r0 apk php82-gd 8.2.13-r0 apk php82-gmp 8.2.13-r0 apk -php82-iconv 8.2.12-r0 apk +php82-iconv 8.2.13-r0 apk php82-imap 8.2.13-r0 apk php82-intl 8.2.13-r0 apk php82-ldap 8.2.13-r0 apk -php82-mbstring 8.2.12-r0 apk +php82-mbstring 8.2.13-r0 apk php82-mysqli 8.2.13-r0 apk php82-mysqlnd 8.2.13-r0 apk php82-opcache 8.2.13-r0 apk -php82-openssl 8.2.12-r0 apk +php82-openssl 8.2.13-r0 apk php82-pdo 8.2.13-r0 apk php82-pdo_mysql 8.2.13-r0 apk php82-pdo_odbc 8.2.13-r0 apk @@ -271,20 +271,20 @@ php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk php82-pecl-redis 6.0.2-r0 apk php82-pgsql 8.2.13-r0 apk -php82-phar 8.2.12-r0 apk +php82-phar 8.2.13-r0 apk php82-posix 8.2.13-r0 apk -php82-session 8.2.12-r0 apk -php82-simplexml 8.2.12-r0 apk +php82-session 8.2.13-r0 apk +php82-simplexml 8.2.13-r0 apk php82-soap 8.2.13-r0 apk php82-sockets 8.2.13-r0 apk php82-sodium 8.2.13-r0 apk php82-sqlite3 8.2.13-r0 apk php82-tokenizer 8.2.13-r0 apk -php82-xml 8.2.12-r0 apk +php82-xml 8.2.13-r0 apk php82-xmlreader 8.2.13-r0 apk -php82-xmlwriter 8.2.12-r0 apk +php82-xmlwriter 8.2.13-r0 apk php82-xsl 8.2.13-r0 apk -php82-zip 8.2.12-r0 apk +php82-zip 8.2.13-r0 apk pinentry 1.2.1-r1 apk pip 23.3.1 python pkb-client 1.2 python @@ -313,7 +313,7 @@ requests 2.31.0 python requests-file 1.5.1 python requests-mock 1.11.0 python rsa 4.9 python -s3transfer 0.8.0 python +s3transfer 0.8.2 python scanelf 1.3.7-r1 apk setuptools 65.5.0 python shadow 4.13-r4 apk From 52e8f7223e7077477f6b323b0aef2b4d166840ee Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 2 Dec 2023 03:18:16 +0000 Subject: [PATCH 21/32] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ff6bceb..76f039c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.33.5 python -botocore 1.33.5 python +boto3 1.33.6 python +botocore 1.33.6 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -123,7 +123,7 @@ httplib2 0.22.0 python icu-data-en 73.2-r2 apk icu-libs 73.2-r2 apk idna 3.6 python -importlib-metadata 6.8.0 python +importlib-metadata 6.9.0 python ip6tables 1.8.9-r2 apk iptables 1.8.9-r2 apk isodate 0.6.1 python From 31cef5050f0f049eaaa6d32a2e694f2eaa8c497b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 6 Dec 2023 01:09:14 +0000 Subject: [PATCH 22/32] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 76f039c..f4a98f7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ PyJWT 2.8.0 python PyNamecheap 0.0.3 python PyYAML 6.0.1 python SimpleLauncherExecutable 1.1.0.14 dotnet -acme 2.7.4 python +acme 2.8.0 python alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk @@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.33.6 python -botocore 1.33.6 python +boto3 1.33.8 python +botocore 1.33.8 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -33,15 +33,15 @@ c-client 2007f-r15 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cachetools 5.3.2 python -certbot 2.7.4 python +certbot 2.8.0 python certbot-dns-acmedns 0.1.0 python certbot-dns-aliyun 2.0.0 python certbot-dns-azure 2.4.0 python certbot-dns-bunny 0.0.9 python -certbot-dns-cloudflare 2.7.4 python +certbot-dns-cloudflare 2.8.0 python certbot-dns-cpanel 0.4.0 python certbot-dns-desec 1.2.1 python -certbot-dns-digitalocean 2.7.4 python +certbot-dns-digitalocean 2.8.0 python certbot-dns-directadmin 1.0.3 python certbot-dns-dnsimple 2.6.0 python certbot-dns-dnsmadeeasy 2.6.0 python @@ -54,7 +54,7 @@ certbot-dns-dynu 0.0.4 python certbot-dns-freedns 0.1.0 python certbot-dns-gehirn 2.6.0 python certbot-dns-godaddy 0.2.2 python -certbot-dns-google 2.7.4 python +certbot-dns-google 2.8.0 python certbot-dns-google-domains 0.1.11 python certbot-dns-he 1.0.0 python certbot-dns-hetzner 2.0.0 python @@ -70,8 +70,8 @@ certbot-dns-njalla 1.0.0 python certbot-dns-nsone 2.6.0 python certbot-dns-ovh 2.6.0 python certbot-dns-porkbun 0.8 python -certbot-dns-rfc2136 2.7.4 python -certbot-dns-route53 2.7.4 python +certbot-dns-rfc2136 2.8.0 python +certbot-dns-route53 2.8.0 python certbot-dns-sakuracloud 2.6.0 python certbot-dns-standalone 1.1 python certbot-dns-transip 0.5.2 python @@ -111,7 +111,7 @@ gnupg-wks-client 2.4.3-r0 apk gnutls 3.8.0-r2 apk google-api-core 2.14.0 python google-api-python-client 2.109.0 python -google-auth 2.24.0 python +google-auth 2.25.0 python google-auth-httplib2 0.1.1 python googleapis-common-protos 1.61.0 python gpg 2.4.3-r0 apk @@ -123,7 +123,7 @@ httplib2 0.22.0 python icu-data-en 73.2-r2 apk icu-libs 73.2-r2 apk idna 3.6 python -importlib-metadata 6.9.0 python +importlib-metadata 7.0.0 python ip6tables 1.8.9-r2 apk iptables 1.8.9-r2 apk isodate 0.6.1 python @@ -196,7 +196,7 @@ marshmallow 3.20.1 python memcached 1.6.21-r0 apk mock 5.1.0 python mpdecimal 2.5.1-r2 apk -msal 1.25.0 python +msal 1.26.0 python msal-extensions 1.0.0 python musl 1.2.4-r2 apk musl-utils 1.2.4-r2 apk From 6c1c4cd00a9f5d8fb62a3782e1d015be398accd5 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 7 Dec 2023 08:50:27 -0500 Subject: [PATCH 23/32] Update nginx-deny.conf --- root/defaults/fail2ban/filter.d/nginx-deny.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/fail2ban/filter.d/nginx-deny.conf b/root/defaults/fail2ban/filter.d/nginx-deny.conf index d9f4694..e646800 100644 --- a/root/defaults/fail2ban/filter.d/nginx-deny.conf +++ b/root/defaults/fail2ban/filter.d/nginx-deny.conf @@ -12,4 +12,4 @@ datepattern = {^LN-BEG} # DEV NOTES: # -# Author: Will L (driz@linuxserver.io) +# Author: notdriz From 78689b02e29f504c80f27cf201d9bb90f8de0507 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 Dec 2023 13:54:35 +0000 Subject: [PATCH 24/32] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f4a98f7..de52a53 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.33.8 python -botocore 1.33.8 python +boto3 1.33.9 python +botocore 1.33.9 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -111,7 +111,7 @@ gnupg-wks-client 2.4.3-r0 apk gnutls 3.8.0-r2 apk google-api-core 2.14.0 python google-api-python-client 2.109.0 python -google-auth 2.25.0 python +google-auth 2.25.1 python google-auth-httplib2 0.1.1 python googleapis-common-protos 1.61.0 python gpg 2.4.3-r0 apk From bdd5e047ee6adb5157cad42ef4a71ee2b6278162 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 9 Dec 2023 03:20:23 +0000 Subject: [PATCH 25/32] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index de52a53..e53289c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ acme 2.8.0 python alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk -alpine-release 3.18.4-r0 apk +alpine-release 3.18.5-r0 apk aom-libs 3.6.1-r0 apk apache2-utils 2.4.58-r0 apk apk-tools 2.14.0-r2 apk @@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.33.9 python -botocore 1.33.9 python +boto3 1.33.11 python +botocore 1.33.11 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -109,11 +109,11 @@ gnupg-keyboxd 2.4.3-r0 apk gnupg-utils 2.4.3-r0 apk gnupg-wks-client 2.4.3-r0 apk gnutls 3.8.0-r2 apk -google-api-core 2.14.0 python -google-api-python-client 2.109.0 python -google-auth 2.25.1 python +google-api-core 2.15.0 python +google-api-python-client 2.110.0 python +google-auth 2.25.2 python google-auth-httplib2 0.1.1 python -googleapis-common-protos 1.61.0 python +googleapis-common-protos 1.62.0 python gpg 2.4.3-r0 apk gpg-agent 2.4.3-r0 apk gpg-wks-server 2.4.3-r0 apk From dabbaa3b144e2fa048c7004c9fd55d48c1554811 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 11 Dec 2023 22:17:57 +0000 Subject: [PATCH 26/32] Deprecate certbot-dns-dynu Signed-off-by: GitHub --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - readme-vars.yml | 18 +++++++++++++++++- root/defaults/dns-conf/dynu.ini | 3 --- 4 files changed, 17 insertions(+), 6 deletions(-) delete mode 100644 root/defaults/dns-conf/dynu.ini diff --git a/Dockerfile b/Dockerfile index eab4093..eea3d74 100755 --- a/Dockerfile +++ b/Dockerfile @@ -104,7 +104,6 @@ RUN \ certbot-dns-domeneshop \ certbot-dns-dreamhost \ certbot-dns-duckdns \ - certbot-dns-dynu \ certbot-dns-freedns \ certbot-dns-gehirn \ certbot-dns-godaddy \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a98ee69..b183d89 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -104,7 +104,6 @@ RUN \ certbot-dns-domeneshop \ certbot-dns-dreamhost \ certbot-dns-duckdns \ - certbot-dns-dynu \ certbot-dns-freedns \ certbot-dns-gehirn \ certbot-dns-godaddy \ diff --git a/readme-vars.yml b/readme-vars.yml index 277c47b..01f7830 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -50,7 +50,7 @@ opt_param_usage_include_env: true opt_param_env_vars: - { env_var: "SUBDOMAINS", env_value: "www,", desc: "Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this *exactly* to `wildcard` (wildcard cert is available via `dns` validation only)" } - { env_var: "CERTPROVIDER", env_value: "", desc: "Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt." } - - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynu`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." } + - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." } - { env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." } - { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." } - { env_var: "ONLY_SUBDOMAINS", env_value: "false", desc: "If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true`" } @@ -90,6 +90,21 @@ app_setup_block: | * After setup, navigate to `https://yourdomain.url` to access the default homepage (http access through port 80 is disabled by default, you can enable it by editing the default site config at `/config/nginx/site-confs/default.conf`). * Certs are checked nightly and if expiration is within 30 days, renewal is attempted. If your cert is about to expire in less than 30 days, check the logs under `/config/log/letsencrypt` to see why the renewals have been failing. It is recommended to input your e-mail in docker parameters so you receive expiration notices from Let's Encrypt in those circumstances. + ### Certbot Plugins + + SWAG includes many Certbot plugins out of the box, but not all plugins can be includes. + If you need a plugin that is not included, the quickest way to have the plugin available is to use our [Universal Package Install Docker Mod](https://github.com/linuxserver/docker-mods/tree/universal-package-install). + + Set the following environment variables on your container: + + ```yaml + DOCKER_MODS=linuxserver/mods:universal-package-install + INSTALL_PIP_PACKAGES=certbot-dns- + ``` + + Set the required credentials (usually found in the plugin documentation) in `/config/dns-conf/.ini`. + It is recommended to attempt obtaining a certificate with `STAGING=true` first to make sure the plugin is working as expected. + ### Security and password protection * The container detects changes to url and subdomains, revokes existing certs and generates new ones during start. @@ -153,6 +168,7 @@ app_setup_block: | # changelog changelogs: + - { date: "11.12.23:", desc: "Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins." } - { date: "30.11.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404." } - { date: "23.11.23:", desc: "Run certbot as root to allow fix http validation." } - { date: "01.10.23:", desc: "Fix \"unrecognized arguments\" issue in DirectAdmin DNS plugin." } diff --git a/root/defaults/dns-conf/dynu.ini b/root/defaults/dns-conf/dynu.ini deleted file mode 100644 index 9c4db55..0000000 --- a/root/defaults/dns-conf/dynu.ini +++ /dev/null @@ -1,3 +0,0 @@ -# Instructions: https://github.com/bikram990/certbot-dns-dynu#configuration -# Replace with your API token from your dynu account. -dns_dynu_auth_token = AbCbASsd!@34 From 3b1478667b923ec889c9ba43828f15e852f17155 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Dec 2023 13:33:00 +0000 Subject: [PATCH 27/32] Bot Updating Templated Files --- README.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3fdb673..0168cf0 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,21 @@ The architectures supported by this image are: * After setup, navigate to `https://yourdomain.url` to access the default homepage (http access through port 80 is disabled by default, you can enable it by editing the default site config at `/config/nginx/site-confs/default.conf`). * Certs are checked nightly and if expiration is within 30 days, renewal is attempted. If your cert is about to expire in less than 30 days, check the logs under `/config/log/letsencrypt` to see why the renewals have been failing. It is recommended to input your e-mail in docker parameters so you receive expiration notices from Let's Encrypt in those circumstances. +### Certbot Plugins + +SWAG includes many Certbot plugins out of the box, but not all plugins can be includes. +If you need a plugin that is not included, the quickest way to have the plugin available is to use our [Universal Package Install Docker Mod](https://github.com/linuxserver/docker-mods/tree/universal-package-install). + +Set the following environment variables on your container: + +```yaml +DOCKER_MODS=linuxserver/mods:universal-package-install +INSTALL_PIP_PACKAGES=certbot-dns- +``` + +Set the required credentials (usually found in the plugin documentation) in `/config/dns-conf/.ini`. +It is recommended to attempt obtaining a certificate with `STAGING=true` first to make sure the plugin is working as expected. + ### Security and password protection * The container detects changes to url and subdomains, revokes existing certs and generates new ones during start. @@ -213,7 +228,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e VALIDATION=http` | Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set). | | `-e SUBDOMAINS=www,` | Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this *exactly* to `wildcard` (wildcard cert is available via `dns` validation only) | | `-e CERTPROVIDER=` | Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt. | -| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynu`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. | +| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. | | `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. | | `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). | | `-e ONLY_SUBDOMAINS=false` | If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true` | @@ -401,6 +416,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.12.23:** - Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins. * **30.11.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404. * **23.11.23:** - Run certbot as root to allow fix http validation. * **01.10.23:** - Fix "unrecognized arguments" issue in DirectAdmin DNS plugin. From 5b77a546209cab487853d3b0d3505578d11e7f52 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Dec 2023 13:36:29 +0000 Subject: [PATCH 28/32] Bot Updating Package Versions --- package_versions.txt | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e53289c..14fb833 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.33.11 python -botocore 1.33.11 python +boto3 1.33.12 python +botocore 1.33.12 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -43,17 +43,16 @@ certbot-dns-cpanel 0.4.0 python certbot-dns-desec 1.2.1 python certbot-dns-digitalocean 2.8.0 python certbot-dns-directadmin 1.0.3 python -certbot-dns-dnsimple 2.6.0 python -certbot-dns-dnsmadeeasy 2.6.0 python +certbot-dns-dnsimple 2.8.0 python +certbot-dns-dnsmadeeasy 2.8.0 python certbot-dns-dnspod 0.1.0 python certbot-dns-do 0.31.0 python certbot-dns-domeneshop 0.2.9 python certbot-dns-dreamhost 1.0 python certbot-dns-duckdns 1.3 python -certbot-dns-dynu 0.0.4 python certbot-dns-freedns 0.1.0 python -certbot-dns-gehirn 2.6.0 python -certbot-dns-godaddy 0.2.2 python +certbot-dns-gehirn 2.8.0 python +certbot-dns-godaddy 2.7.4 python certbot-dns-google 2.8.0 python certbot-dns-google-domains 0.1.11 python certbot-dns-he 1.0.0 python @@ -61,18 +60,18 @@ certbot-dns-hetzner 2.0.0 python certbot-dns-infomaniak 0.2.1 python certbot-dns-inwx 2.2.0 python certbot-dns-ionos 2023.11.13.post1 python -certbot-dns-linode 2.6.0 python +certbot-dns-linode 2.8.0 python certbot-dns-loopia 1.0.1 python -certbot-dns-luadns 2.6.0 python +certbot-dns-luadns 2.8.0 python certbot-dns-namecheap 1.0.0 python certbot-dns-netcup 1.4.3 python certbot-dns-njalla 1.0.0 python -certbot-dns-nsone 2.6.0 python -certbot-dns-ovh 2.6.0 python +certbot-dns-nsone 2.8.0 python +certbot-dns-ovh 2.8.0 python certbot-dns-porkbun 0.8 python certbot-dns-rfc2136 2.8.0 python certbot-dns-route53 2.8.0 python -certbot-dns-sakuracloud 2.6.0 python +certbot-dns-sakuracloud 2.8.0 python certbot-dns-standalone 1.1 python certbot-dns-transip 0.5.2 python certbot-dns-vultr 1.1.0 python @@ -84,10 +83,10 @@ cloudflare 2.14.2 python configobj 5.0.8 python coreutils 9.3-r1 apk cryptography 41.0.7 python -curl 8.4.0-r0 apk +curl 8.5.0-r0 apk dataclasses-json 0.5.14 python distro 1.8.0 python -dns-lexicon 3.11.7 python +dns-lexicon 3.17.0 python dnslib 0.9.23 python dnspython 2.4.2 python domeneshop 0.4.3 python @@ -123,13 +122,12 @@ httplib2 0.22.0 python icu-data-en 73.2-r2 apk icu-libs 73.2-r2 apk idna 3.6 python -importlib-metadata 7.0.0 python ip6tables 1.8.9-r2 apk iptables 1.8.9-r2 apk isodate 0.6.1 python jmespath 1.0.1 python josepy 1.14.0 python -jq 1.6-r3 apk +jq 1.6-r4 apk jsonlines 4.0.0 python jsonpickle 3.0.2 python libacl 2.3.1-r3 apk @@ -140,7 +138,7 @@ libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.4-r1 apk -libcurl 8.4.0-r0 apk +libcurl 8.5.0-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk libevent 2.1.12-r6 apk @@ -197,7 +195,7 @@ memcached 1.6.21-r0 apk mock 5.1.0 python mpdecimal 2.5.1-r2 apk msal 1.26.0 python -msal-extensions 1.0.0 python +msal-extensions 1.1.0 python musl 1.2.4-r2 apk musl-utils 1.2.4-r2 apk mypy-extensions 1.0.0 python @@ -300,6 +298,7 @@ pyasn1 0.5.1 python pyasn1-modules 0.3.0 python pyc 0.1-r0 apk pycparser 2.21 python +pyotp 2.9.0 python pyparsing 3.1.1 python python-dateutil 2.8.2 python python-digitalocean 1.17.0 python @@ -325,16 +324,15 @@ ssl_client 1.36.1-r5 apk tiff 4.5.1-r0 apk tldextract 5.1.1 python typing-inspect 0.9.0 python -typing_extensions 4.8.0 python +typing_extensions 4.9.0 python tzdata 2023c-r1 apk unixodbc 2.3.11-r2 apk uritemplate 4.1.1 python -urllib3 1.26.18 python +urllib3 2.0.7 python utmps-libs 0.1.2.1-r1 apk wheel 0.42.0 python whois 5.5.17-r0 apk xz-libs 5.4.3-r0 apk -zipp 3.17.0 python zlib 1.2.13-r1 apk zope.interface 6.1 python zstd-libs 1.5.5-r4 apk From 7c5d1d886c9040f3d370a16c70152889d6f668ce Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 16 Dec 2023 03:18:17 +0000 Subject: [PATCH 29/32] Bot Updating Package Versions --- package_versions.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 14fb833..ca8b70f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,6 +9,7 @@ alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk alpine-release 3.18.5-r0 apk +anyio 4.1.0 python aom-libs 3.6.1-r0 apk apache2-utils 2.4.58-r0 apk apk-tools 2.14.0-r2 apk @@ -17,14 +18,14 @@ apr-util 1.6.3-r1 apk argon2-libs 20190702-r4 apk attrs 23.1.0 python azure-common 1.1.28 python -azure-core 1.29.5 python +azure-core 1.29.6 python azure-identity 1.15.0 python azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.33.12 python -botocore 1.33.12 python +boto3 1.34.2 python +botocore 1.34.2 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -79,7 +80,7 @@ certbot-plugin-gandi 1.5.0 python certifi 2023.11.17 python cffi 1.16.0 python charset-normalizer 3.3.2 python -cloudflare 2.14.2 python +cloudflare 2.14.3 python configobj 5.0.8 python coreutils 9.3-r1 apk cryptography 41.0.7 python @@ -109,9 +110,9 @@ gnupg-utils 2.4.3-r0 apk gnupg-wks-client 2.4.3-r0 apk gnutls 3.8.0-r2 apk google-api-core 2.15.0 python -google-api-python-client 2.110.0 python +google-api-python-client 2.111.0 python google-auth 2.25.2 python -google-auth-httplib2 0.1.1 python +google-auth-httplib2 0.2.0 python googleapis-common-protos 1.62.0 python gpg 2.4.3-r0 apk gpg-agent 2.4.3-r0 apk @@ -312,12 +313,13 @@ requests 2.31.0 python requests-file 1.5.1 python requests-mock 1.11.0 python rsa 4.9 python -s3transfer 0.8.2 python +s3transfer 0.9.0 python scanelf 1.3.7-r1 apk setuptools 65.5.0 python shadow 4.13-r4 apk six 1.16.0 python skalibs 2.13.1.1-r1 apk +sniffio 1.3.0 python soupsieve 2.5 python sqlite-libs 3.41.2-r2 apk ssl_client 1.36.1-r5 apk From bf6ab14281b8caffbc46a453fb23a48be8cc627b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 23 Dec 2023 03:17:49 +0000 Subject: [PATCH 30/32] Bot Updating Package Versions --- package_versions.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ca8b70f..38ff794 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,13 +3,13 @@ ConfigArgParse 1.7 python PyJWT 2.8.0 python PyNamecheap 0.0.3 python PyYAML 6.0.1 python -SimpleLauncherExecutable 1.1.0.14 dotnet +Simple Launcher 1.1.0.14 dotnet acme 2.8.0 python alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk alpine-release 3.18.5-r0 apk -anyio 4.1.0 python +anyio 4.2.0 python aom-libs 3.6.1-r0 apk apache2-utils 2.4.58-r0 apk apk-tools 2.14.0-r2 apk @@ -24,8 +24,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.34.2 python -botocore 1.34.2 python +boto3 1.34.7 python +botocore 1.34.7 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -81,6 +81,7 @@ certifi 2023.11.17 python cffi 1.16.0 python charset-normalizer 3.3.2 python cloudflare 2.14.3 python +composer 2.6.6 binary configobj 5.0.8 python coreutils 9.3-r1 apk cryptography 41.0.7 python @@ -189,7 +190,7 @@ libzip 1.9.2-r2 apk linux-pam 1.5.2-r10 apk logrotate 3.21.0-r1 apk loopialib 0.2.0 python -lxml 4.9.3 python +lxml 4.9.4 python lz4-libs 1.9.4-r4 apk marshmallow 3.20.1 python memcached 1.6.21-r0 apk @@ -265,7 +266,7 @@ php82-pdo_sqlite 8.2.13-r0 apk php82-pear 8.2.13-r0 apk php82-pecl-apcu 5.1.22-r0 apk php82-pecl-igbinary 3.2.14-r0 apk -php82-pecl-mcrypt 1.0.6-r0 apk +php82-pecl-mcrypt 1.0.7-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk php82-pecl-redis 6.0.2-r0 apk @@ -285,7 +286,7 @@ php82-xmlwriter 8.2.13-r0 apk php82-xsl 8.2.13-r0 apk php82-zip 8.2.13-r0 apk pinentry 1.2.1-r1 apk -pip 23.3.1 python +pip 23.3.2 python pkb-client 1.2 python popt 1.19-r2 apk portalocker 2.8.2 python @@ -313,7 +314,7 @@ requests 2.31.0 python requests-file 1.5.1 python requests-mock 1.11.0 python rsa 4.9 python -s3transfer 0.9.0 python +s3transfer 0.10.0 python scanelf 1.3.7-r1 apk setuptools 65.5.0 python shadow 4.13-r4 apk From accd20cc7af479cc797cc4d64e218058f7f2ada2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Dec 2023 03:18:23 +0000 Subject: [PATCH 31/32] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 38ff794..ff00953 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,8 +24,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.34.7 python -botocore 1.34.7 python +boto3 1.34.11 python +botocore 1.34.11 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -80,14 +80,14 @@ certbot-plugin-gandi 1.5.0 python certifi 2023.11.17 python cffi 1.16.0 python charset-normalizer 3.3.2 python -cloudflare 2.14.3 python +cloudflare 2.15.1 python composer 2.6.6 binary configobj 5.0.8 python coreutils 9.3-r1 apk cryptography 41.0.7 python curl 8.5.0-r0 apk dataclasses-json 0.5.14 python -distro 1.8.0 python +distro 1.9.0 python dns-lexicon 3.17.0 python dnslib 0.9.23 python dnspython 2.4.2 python @@ -190,7 +190,7 @@ libzip 1.9.2-r2 apk linux-pam 1.5.2-r10 apk logrotate 3.21.0-r1 apk loopialib 0.2.0 python -lxml 4.9.4 python +lxml 5.0.0 python lz4-libs 1.9.4-r4 apk marshmallow 3.20.1 python memcached 1.6.21-r0 apk From 87ca95c8c221a94cc8151a32e458ada7bfe1f6ea Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 6 Jan 2024 03:21:45 +0000 Subject: [PATCH 32/32] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ff00953..4e019dd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ apk-tools 2.14.0-r2 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r4 apk -attrs 23.1.0 python +attrs 23.2.0 python azure-common 1.1.28 python azure-core 1.29.6 python azure-identity 1.15.0 python @@ -24,8 +24,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.34.11 python -botocore 1.34.11 python +boto3 1.34.14 python +botocore 1.34.14 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1-r5 apk @@ -53,7 +53,7 @@ certbot-dns-dreamhost 1.0 python certbot-dns-duckdns 1.3 python certbot-dns-freedns 0.1.0 python certbot-dns-gehirn 2.8.0 python -certbot-dns-godaddy 2.7.4 python +certbot-dns-godaddy 2.8.0 python certbot-dns-google 2.8.0 python certbot-dns-google-domains 0.1.11 python certbot-dns-he 1.0.0 python @@ -80,7 +80,7 @@ certbot-plugin-gandi 1.5.0 python certifi 2023.11.17 python cffi 1.16.0 python charset-normalizer 3.3.2 python -cloudflare 2.15.1 python +cloudflare 2.16.0 python composer 2.6.6 binary configobj 5.0.8 python coreutils 9.3-r1 apk @@ -89,7 +89,7 @@ curl 8.5.0-r0 apk dataclasses-json 0.5.14 python distro 1.9.0 python dns-lexicon 3.17.0 python -dnslib 0.9.23 python +dnslib 0.9.24 python dnspython 2.4.2 python domeneshop 0.4.3 python fail2ban 1.0.2 python @@ -111,8 +111,8 @@ gnupg-utils 2.4.3-r0 apk gnupg-wks-client 2.4.3-r0 apk gnutls 3.8.0-r2 apk google-api-core 2.15.0 python -google-api-python-client 2.111.0 python -google-auth 2.25.2 python +google-api-python-client 2.112.0 python +google-auth 2.26.1 python google-auth-httplib2 0.2.0 python googleapis-common-protos 1.62.0 python gpg 2.4.3-r0 apk @@ -190,7 +190,7 @@ libzip 1.9.2-r2 apk linux-pam 1.5.2-r10 apk logrotate 3.21.0-r1 apk loopialib 0.2.0 python -lxml 5.0.0 python +lxml 5.0.1 python lz4-libs 1.9.4-r4 apk marshmallow 3.20.1 python memcached 1.6.21-r0 apk @@ -328,7 +328,7 @@ tiff 4.5.1-r0 apk tldextract 5.1.1 python typing-inspect 0.9.0 python typing_extensions 4.9.0 python -tzdata 2023c-r1 apk +tzdata 2023d-r0 apk unixodbc 2.3.11-r2 apk uritemplate 4.1.1 python urllib3 2.0.7 python