From 4899670c70c4a18285e01d2ceda03e4c92b0d285 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 7 Mar 2023 19:02:03 -0600 Subject: [PATCH 01/34] Cleanup unused csr and keys folders --- README.md | 1 + readme-vars.yml | 1 + root/etc/s6-overlay/s6-rc.d/init-certbot-config/run | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/README.md b/README.md index e691258..7108e36 100644 --- a/README.md +++ b/README.md @@ -336,6 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **07.03.23:** - Cleanup unused csr and keys folders. See [certbot 2.3.0 release notes](https://github.com/certbot/certbot/releases/tag/v2.3.0). * **02.03.23:** - Set permissions on crontabs during init. * **09.02.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf, authelia-location.conf and authelia-server.conf - Add Authentik configs, update Authelia configs. * **06.02.23:** - Add porkbun support back in. diff --git a/readme-vars.yml b/readme-vars.yml index 9aa2f82..0affb5d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -154,6 +154,7 @@ app_setup_block: | # changelog changelogs: + - { date: "07.03.23:", desc: "Cleanup unused csr and keys folders. See [certbot 2.3.0 release notes](https://github.com/certbot/certbot/releases/tag/v2.3.0)." } - { date: "02.03.23:", desc: "Set permissions on crontabs during init." } - { date: "09.02.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf, authelia-location.conf and authelia-server.conf - Add Authentik configs, update Authelia configs." } - { date: "06.02.23:", desc: "Add porkbun support back in." } 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 3ad4284..db10a1e 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 @@ -140,6 +140,10 @@ else ln -s ../etc/letsencrypt/live/"${URL}" /config/keys/letsencrypt fi +# cleanup unused csr and keys folders +rm -rf /etc/letsencrypt/csr +rm -rf /etc/letsencrypt/keys + # checking for changes in cert variables, revoking certs if necessary if [[ ! "${URL}" = "${ORIGURL}" ]] || [[ ! "${SUBDOMAINS}" = "${ORIGSUBDOMAINS}" ]] || From 0c1936f8ecfacf09509341724f3184bb2974c427 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 10 Mar 2023 17:29:40 -0600 Subject: [PATCH 02/34] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e77930d..44dcad7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ azure-mgmt-core 1.3.2 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.11.2 python -boto3 1.26.88 python -botocore 1.29.88 python +boto3 1.26.89 python +botocore 1.29.89 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary From 7dac2826218df0e8d007a532ba783feef24f65e5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 Mar 2023 06:18:36 +0100 Subject: [PATCH 03/34] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 44dcad7..c94965f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ azure-mgmt-core 1.3.2 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.11.2 python -boto3 1.26.89 python -botocore 1.29.89 python +boto3 1.26.92 python +botocore 1.29.92 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -46,7 +46,7 @@ certbot-dns-dnsmadeeasy 2.4.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-duckdns 1.2.1 python +certbot-dns-duckdns 1.3 python certbot-dns-dynu 0.0.4 python certbot-dns-gehirn 2.4.0 python certbot-dns-godaddy 0.2.2 python @@ -64,7 +64,7 @@ certbot-dns-netcup 1.2.0 python certbot-dns-njalla 1.0.0 python certbot-dns-nsone 2.4.0 python certbot-dns-ovh 2.4.0 python -certbot-dns-porkbun 0.7 python +certbot-dns-porkbun 0.8 python certbot-dns-rfc2136 2.4.0 python certbot-dns-route53 2.4.0 python certbot-dns-sakuracloud 2.4.0 python @@ -88,7 +88,7 @@ dnspython 2.3.0 python domeneshop 0.4.3 python fail2ban 1.0.2 python fail2ban 1.0.2-r0 apk -filelock 3.9.0 python +filelock 3.10.0 python fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk future 0.18.3 python @@ -103,7 +103,7 @@ gnupg-utils 2.2.40-r0 apk gnupg-wks-client 2.2.40-r0 apk gnutls 3.7.8-r3 apk google-api-core 2.11.0 python -google-api-python-client 2.80.0 python +google-api-python-client 2.81.0 python google-auth 2.16.2 python google-auth-httplib2 0.1.0 python googleapis-common-protos 1.58.0 python @@ -175,7 +175,7 @@ libxdmcp 1.1.4-r0 apk libxext 1.3.5-r0 apk libxml2 2.10.3-r1 apk libxpm 3.5.15-r0 apk -libxslt 1.1.37-r0 apk +libxslt 1.1.37-r1 apk libxt 1.2.1-r0 apk libzip 1.9.2-r2 apk linux-pam 1.5.2-r1 apk @@ -328,9 +328,9 @@ typing_extensions 4.5.0 python tzdata 2022f-r1 apk unixodbc 2.3.11-r0 apk uritemplate 4.1.1 python -urllib3 1.26.14 python +urllib3 1.26.15 python utmps-libs 0.1.2.0-r1 apk -wheel 0.38.4 python +wheel 0.40.0 python whois 5.5.14-r0 apk xz 5.2.9-r0 apk xz-libs 5.2.9-r0 apk From b00bf6caf2bccb9e0ab4d368c24e855464b57afb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 Mar 2023 00:17:30 -0500 Subject: [PATCH 04/34] Bot Updating Package Versions --- package_versions.txt | 108 +++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c94965f..8ccd5f0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -20,9 +20,9 @@ azure-identity 1.12.0 python azure-mgmt-core 1.3.2 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk -beautifulsoup4 4.11.2 python -boto3 1.26.92 python -botocore 1.29.92 python +beautifulsoup4 4.12.0 python +boto3 1.26.97 python +botocore 1.29.97 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -51,7 +51,7 @@ certbot-dns-dynu 0.0.4 python certbot-dns-gehirn 2.4.0 python certbot-dns-godaddy 0.2.2 python certbot-dns-google 2.4.0 python -certbot-dns-google-domains 0.1.6 python +certbot-dns-google-domains 0.1.8 python certbot-dns-he 1.0.0 python certbot-dns-hetzner 2.0.0 python certbot-dns-infomaniak 0.2.1 python @@ -88,7 +88,7 @@ dnspython 2.3.0 python domeneshop 0.4.3 python fail2ban 1.0.2 python fail2ban 1.0.2-r0 apk -filelock 3.10.0 python +filelock 3.10.2 python fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk future 0.18.3 python @@ -103,20 +103,20 @@ gnupg-utils 2.2.40-r0 apk gnupg-wks-client 2.2.40-r0 apk gnutls 3.7.8-r3 apk google-api-core 2.11.0 python -google-api-python-client 2.81.0 python +google-api-python-client 2.82.0 python google-auth 2.16.2 python google-auth-httplib2 0.1.0 python -googleapis-common-protos 1.58.0 python +googleapis-common-protos 1.59.0 python gpg 2.2.40-r0 apk gpg-agent 2.2.40-r0 apk gpg-wks-server 2.2.40-r0 apk gpgsm 2.2.40-r0 apk gpgv 2.2.40-r0 apk -httplib2 0.21.0 python +httplib2 0.22.0 python icu-data-en 72.1-r1 apk icu-libs 72.1-r1 apk idna 3.4 python -importlib-metadata 6.0.0 python +importlib-metadata 6.1.0 python ip6tables 1.8.8-r2 apk iptables 1.8.8-r2 apk isodate 0.6.1 python @@ -132,8 +132,8 @@ libavif 0.11.1-r0 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r0 apk -libcurl 7.88.1-r0 apk +libcrypto3 3.0.8-r1 apk +libcurl 7.88.1-r1 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk libevent 2.1.12-r5 apk @@ -162,7 +162,7 @@ libsasl 2.1.28-r3 apk libseccomp 2.5.4-r0 apk libsm 1.2.3-r1 apk libsodium 1.0.18-r2 apk -libssl3 3.0.8-r0 apk +libssl3 3.0.8-r1 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libunistring 1.1-r0 apk @@ -233,36 +233,36 @@ pcre2 10.42-r0 apk perl 5.36.0-r0 apk perl-error 0.17029-r1 apk perl-git 2.38.4-r1 apk -php-cli 8.1.16 binary +php-cli 8.1.17 binary php-fpm 8.1.16 binary -php81 8.1.16-r0 apk -php81-bcmath 8.1.16-r0 apk -php81-bz2 8.1.16-r0 apk -php81-common 8.1.16-r0 apk -php81-ctype 8.1.16-r0 apk -php81-curl 8.1.16-r0 apk -php81-dom 8.1.16-r0 apk -php81-exif 8.1.16-r0 apk +php81 8.1.17-r0 apk +php81-bcmath 8.1.17-r0 apk +php81-bz2 8.1.17-r0 apk +php81-common 8.1.17-r0 apk +php81-ctype 8.1.17-r0 apk +php81-curl 8.1.17-r0 apk +php81-dom 8.1.17-r0 apk +php81-exif 8.1.17-r0 apk php81-fileinfo 8.1.16-r0 apk php81-fpm 8.1.16-r0 apk -php81-ftp 8.1.16-r0 apk -php81-gd 8.1.16-r0 apk -php81-gmp 8.1.16-r0 apk -php81-iconv 8.1.16-r0 apk -php81-imap 8.1.16-r0 apk -php81-intl 8.1.16-r0 apk -php81-ldap 8.1.16-r0 apk -php81-mbstring 8.1.16-r0 apk -php81-mysqli 8.1.16-r0 apk -php81-mysqlnd 8.1.16-r0 apk -php81-opcache 8.1.16-r0 apk -php81-openssl 8.1.16-r0 apk -php81-pdo 8.1.16-r0 apk -php81-pdo_mysql 8.1.16-r0 apk -php81-pdo_odbc 8.1.16-r0 apk -php81-pdo_pgsql 8.1.16-r0 apk -php81-pdo_sqlite 8.1.16-r0 apk -php81-pear 8.1.16-r0 apk +php81-ftp 8.1.17-r0 apk +php81-gd 8.1.17-r0 apk +php81-gmp 8.1.17-r0 apk +php81-iconv 8.1.17-r0 apk +php81-imap 8.1.17-r0 apk +php81-intl 8.1.17-r0 apk +php81-ldap 8.1.17-r0 apk +php81-mbstring 8.1.17-r0 apk +php81-mysqli 8.1.17-r0 apk +php81-mysqlnd 8.1.17-r0 apk +php81-opcache 8.1.17-r0 apk +php81-openssl 8.1.17-r0 apk +php81-pdo 8.1.17-r0 apk +php81-pdo_mysql 8.1.17-r0 apk +php81-pdo_odbc 8.1.17-r0 apk +php81-pdo_pgsql 8.1.17-r0 apk +php81-pdo_sqlite 8.1.17-r0 apk +php81-pear 8.1.17-r0 apk php81-pecl-apcu 5.1.22-r0 apk php81-pecl-igbinary 3.2.12-r0 apk php81-pecl-mailparse 3.1.4-r0 apk @@ -270,21 +270,21 @@ php81-pecl-mcrypt 1.0.6-r0 apk php81-pecl-memcached 3.2.0-r0 apk php81-pecl-redis 5.3.7-r0 apk php81-pecl-xmlrpc 1.0.0_rc3-r0 apk -php81-pgsql 8.1.16-r0 apk -php81-phar 8.1.16-r0 apk -php81-posix 8.1.16-r0 apk -php81-session 8.1.16-r0 apk +php81-pgsql 8.1.17-r0 apk +php81-phar 8.1.17-r0 apk +php81-posix 8.1.17-r0 apk +php81-session 8.1.17-r0 apk php81-simplexml 8.1.16-r0 apk -php81-soap 8.1.16-r0 apk -php81-sockets 8.1.16-r0 apk -php81-sodium 8.1.16-r0 apk -php81-sqlite3 8.1.16-r0 apk -php81-tokenizer 8.1.16-r0 apk -php81-xml 8.1.16-r0 apk -php81-xmlreader 8.1.16-r0 apk +php81-soap 8.1.17-r0 apk +php81-sockets 8.1.17-r0 apk +php81-sodium 8.1.17-r0 apk +php81-sqlite3 8.1.17-r0 apk +php81-tokenizer 8.1.17-r0 apk +php81-xml 8.1.17-r0 apk +php81-xmlreader 8.1.17-r0 apk php81-xmlwriter 8.1.16-r0 apk -php81-xsl 8.1.16-r0 apk -php81-zip 8.1.16-r0 apk +php81-xsl 8.1.17-r0 apk +php81-zip 8.1.17-r0 apk pinentry 1.2.1-r0 apk pip 23.0.1 python pkb-client 1.2 python @@ -321,7 +321,7 @@ skalibs 2.12.0.1-r0 apk soupsieve 2.4 python sqlite-libs 3.40.1-r0 apk ssl_client 1.35.0-r29 apk -tiff 4.4.0-r1 apk +tiff 4.4.0-r3 apk tldextract 3.4.0 python typing-inspect 0.8.0 python typing_extensions 4.5.0 python @@ -336,5 +336,5 @@ xz 5.2.9-r0 apk xz-libs 5.2.9-r0 apk zipp 3.15.0 python zlib 1.2.13-r0 apk -zope.interface 5.5.2 python +zope.interface 6.0 python zstd-libs 1.5.2-r9 apk From 97222fbb25cd1ef0dc11a877060245e1050868a6 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 25 Mar 2023 11:32:25 -0500 Subject: [PATCH 05/34] Fix renewal post hook --- README.md | 1 + readme-vars.yml | 1 + root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx | 2 +- root/etc/s6-overlay/s6-rc.d/init-certbot-config/run | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e96bc2..28b753f 100644 --- a/README.md +++ b/README.md @@ -336,6 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **25.03.23:** - Fix renewal post hook. * **10.03.23:** - Cleanup unused csr and keys folders. See [certbot 2.3.0 release notes](https://github.com/certbot/certbot/releases/tag/v2.3.0). * **09.03.23:** - Add Google Domains DNS support, `google-domains`. * **02.03.23:** - Set permissions on crontabs during init. diff --git a/readme-vars.yml b/readme-vars.yml index c3d7a44..ef33164 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -154,6 +154,7 @@ app_setup_block: | # changelog changelogs: + - { date: "25.03.23:", desc: "Fix renewal post hook." } - { date: "10.03.23:", desc: "Cleanup unused csr and keys folders. See [certbot 2.3.0 release notes](https://github.com/certbot/certbot/releases/tag/v2.3.0)." } - { date: "09.03.23:", desc: "Add Google Domains DNS support, `google-domains`." } - { date: "02.03.23:", desc: "Set permissions on crontabs during init." } diff --git a/root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx b/root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx index 43830ed..e067530 100644 --- a/root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx +++ b/root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx @@ -5,7 +5,7 @@ . /config/.donoteditthisfile.conf if [[ ! "${ORIGVALIDATION}" = "dns" ]] && [[ ! "${ORIGVALIDATION}" = "duckdns" ]]; then - if pgrep -f "s6-supervise nginx" >/dev/null; then + if pgrep -f "s6-supervise svc-nginx" >/dev/null; then s6-svc -u /run/service/svc-nginx fi else 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 f0d482a..812042a 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 @@ -41,6 +41,7 @@ lsiown -R abc:abc /config/etc/letsencrypt/renewal-hooks # replace nginx service location in renewal hooks find /config/etc/letsencrypt/renewal-hooks/ -type f -exec sed -i 's|/run/service/nginx|/run/service/svc-nginx|g' {} \; find /config/etc/letsencrypt/renewal-hooks/ -type f -exec sed -i 's|/var/run/s6/services/nginx|/run/service/svc-nginx|g' {} \; +find /config/etc/letsencrypt/renewal-hooks/ -type f -exec sed -i 's|s6-supervise nginx|s6-supervise svc-nginx|g' {} \; # create original config file if it doesn't exist, move non-hidden legacy file to hidden if [[ -f "/config/donoteditthisfile.conf" ]]; then From 70c66c549531ecb915e7f466114ad6a414c92e28 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 25 Mar 2023 18:02:53 +0100 Subject: [PATCH 06/34] Bot Updating Package Versions --- package_versions.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8ccd5f0..1c01a81 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ azure-mgmt-core 1.3.2 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.12.0 python -boto3 1.26.97 python -botocore 1.29.97 python +boto3 1.26.99 python +botocore 1.29.99 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -51,7 +51,7 @@ certbot-dns-dynu 0.0.4 python certbot-dns-gehirn 2.4.0 python certbot-dns-godaddy 0.2.2 python certbot-dns-google 2.4.0 python -certbot-dns-google-domains 0.1.8 python +certbot-dns-google-domains 0.1.9 python certbot-dns-he 1.0.0 python certbot-dns-hetzner 2.0.0 python certbot-dns-infomaniak 0.2.1 python @@ -78,8 +78,8 @@ charset-normalizer 3.1.0 python cloudflare 2.11.1 python configobj 5.0.8 python coreutils 9.1-r0 apk -cryptography 39.0.2 python -curl 7.88.1-r0 apk +cryptography 40.0.1 python +curl 7.88.1-r1 apk dataclasses-json 0.5.7 python distro 1.8.0 python dns-lexicon 3.11.7 python @@ -88,7 +88,7 @@ dnspython 2.3.0 python domeneshop 0.4.3 python fail2ban 1.0.2 python fail2ban 1.0.2-r0 apk -filelock 3.10.2 python +filelock 3.10.4 python fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk future 0.18.3 python @@ -104,7 +104,7 @@ gnupg-wks-client 2.2.40-r0 apk gnutls 3.7.8-r3 apk google-api-core 2.11.0 python google-api-python-client 2.82.0 python -google-auth 2.16.2 python +google-auth 2.16.3 python google-auth-httplib2 0.1.0 python googleapis-common-protos 1.59.0 python gpg 2.2.40-r0 apk @@ -224,7 +224,7 @@ npth 1.6-r2 apk oauth2client 4.1.3 python oauthlib 3.2.2 python oniguruma 6.9.8-r0 apk -openssl 3.0.8-r0 apk +openssl 3.0.8-r1 apk p11-kit 0.24.1-r1 apk packaging 23.0 python parsedatetime 2.6 python @@ -234,7 +234,7 @@ perl 5.36.0-r0 apk perl-error 0.17029-r1 apk perl-git 2.38.4-r1 apk php-cli 8.1.17 binary -php-fpm 8.1.16 binary +php-fpm 8.1.17 binary php81 8.1.17-r0 apk php81-bcmath 8.1.17-r0 apk php81-bz2 8.1.17-r0 apk @@ -243,8 +243,8 @@ php81-ctype 8.1.17-r0 apk php81-curl 8.1.17-r0 apk php81-dom 8.1.17-r0 apk php81-exif 8.1.17-r0 apk -php81-fileinfo 8.1.16-r0 apk -php81-fpm 8.1.16-r0 apk +php81-fileinfo 8.1.17-r0 apk +php81-fpm 8.1.17-r0 apk php81-ftp 8.1.17-r0 apk php81-gd 8.1.17-r0 apk php81-gmp 8.1.17-r0 apk @@ -274,7 +274,7 @@ php81-pgsql 8.1.17-r0 apk php81-phar 8.1.17-r0 apk php81-posix 8.1.17-r0 apk php81-session 8.1.17-r0 apk -php81-simplexml 8.1.16-r0 apk +php81-simplexml 8.1.17-r0 apk php81-soap 8.1.17-r0 apk php81-sockets 8.1.17-r0 apk php81-sodium 8.1.17-r0 apk @@ -282,7 +282,7 @@ php81-sqlite3 8.1.17-r0 apk php81-tokenizer 8.1.17-r0 apk php81-xml 8.1.17-r0 apk php81-xmlreader 8.1.17-r0 apk -php81-xmlwriter 8.1.16-r0 apk +php81-xmlwriter 8.1.17-r0 apk php81-xsl 8.1.17-r0 apk php81-zip 8.1.17-r0 apk pinentry 1.2.1-r0 apk @@ -293,7 +293,7 @@ portalocker 2.7.0 python procps 3.3.17-r2 apk protobuf 4.22.1 python publicsuffixlist 0.9.3 python -pyOpenSSL 23.0.0 python +pyOpenSSL 23.1.0 python pyRFC3339 1.1 python pyacmedns 0.4 python pyasn1 0.4.8 python @@ -305,7 +305,7 @@ python-dateutil 2.8.2 python python-digitalocean 1.17.0 python python-transip 0.6.0 python python3 3.10.10-r0 apk -pytz 2022.7.1 python +pytz 2023.2 python readline 8.2.0-r0 apk requests 2.28.2 python requests-file 1.5.1 python From b9092146148f46bb7d74153bbd66d2f52ce30e0a Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Tue, 28 Mar 2023 15:29:10 -0400 Subject: [PATCH 07/34] Update authentik-server.conf.sample --- root/defaults/nginx/authentik-server.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/authentik-server.conf.sample b/root/defaults/nginx/authentik-server.conf.sample index 8bbadca..9f497c9 100644 --- a/root/defaults/nginx/authentik-server.conf.sample +++ b/root/defaults/nginx/authentik-server.conf.sample @@ -1,6 +1,6 @@ ## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-server.conf.sample # Make sure that your authentik container is in the same user defined bridge network and is named authentik-server -# Rename /config/nginx/proxy-confs/authentik.conf.sample to /config/nginx/proxy-confs/authentik.conf +# Rename /config/nginx/proxy-confs/authentik-server.conf.sample to /config/nginx/proxy-confs/authentik-server.conf # location for authentik subfolder requests location ^~ /outpost.goauthentik.io { From 286e74c027eed9369880345edca363e18faf7c57 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Tue, 28 Mar 2023 20:32:47 -0400 Subject: [PATCH 08/34] Update authentik-server.conf.sample --- root/defaults/nginx/authentik-server.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/authentik-server.conf.sample b/root/defaults/nginx/authentik-server.conf.sample index 9f497c9..08ac225 100644 --- a/root/defaults/nginx/authentik-server.conf.sample +++ b/root/defaults/nginx/authentik-server.conf.sample @@ -1,6 +1,6 @@ ## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-server.conf.sample # Make sure that your authentik container is in the same user defined bridge network and is named authentik-server -# Rename /config/nginx/proxy-confs/authentik-server.conf.sample to /config/nginx/proxy-confs/authentik-server.conf +# Rename /config/nginx/proxy-confs/authentik.subdomain.conf.sample to /config/nginx/proxy-confs/authentik.subdomain.conf # location for authentik subfolder requests location ^~ /outpost.goauthentik.io { From 3105c07c7281304d144c801cab5fb8c53e89f2e7 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Tue, 28 Mar 2023 20:33:32 -0400 Subject: [PATCH 09/34] Update authentik-location.conf.sample --- root/defaults/nginx/authentik-location.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/authentik-location.conf.sample b/root/defaults/nginx/authentik-location.conf.sample index 5571c45..38001fe 100644 --- a/root/defaults/nginx/authentik-location.conf.sample +++ b/root/defaults/nginx/authentik-location.conf.sample @@ -1,6 +1,6 @@ ## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-location.conf.sample # Make sure that your authentik container is in the same user defined bridge network and is named authentik-server -# Rename /config/nginx/proxy-confs/authentik.conf.sample to /config/nginx/proxy-confs/authentik.conf +# Rename /config/nginx/proxy-confs/authentik.subdomain.conf.sample to /config/nginx/proxy-confs/authentik.subdomain.conf ## Send a subrequest to Authentik to verify if the user is authenticated and has permission to access the resource. auth_request /outpost.goauthentik.io/auth/nginx; From 9488a4fa1d7c4da81ed7b5871e827c14d0ac0ae0 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Tue, 28 Mar 2023 20:33:53 -0400 Subject: [PATCH 10/34] Update authelia-location.conf.sample --- root/defaults/nginx/authelia-location.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/authelia-location.conf.sample b/root/defaults/nginx/authelia-location.conf.sample index c48ef6f..430b2f7 100644 --- a/root/defaults/nginx/authelia-location.conf.sample +++ b/root/defaults/nginx/authelia-location.conf.sample @@ -1,6 +1,6 @@ ## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-location.conf.sample # Make sure that your authelia container is in the same user defined bridge network and is named authelia -# Rename /config/nginx/proxy-confs/authelia.conf.sample to /config/nginx/proxy-confs/authelia.conf +# Rename /config/nginx/proxy-confs/authelia.subdomain.conf.sample to /config/nginx/proxy-confs/authelia.subdomain.conf # Make sure that the authelia configuration.yml has 'path: "authelia"' defined ## Send a subrequest to Authelia to verify if the user is authenticated and has permission to access the resource. From 9ce4ec598da40a48b8104c7346f2ef7a433e305d Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Tue, 28 Mar 2023 20:34:10 -0400 Subject: [PATCH 11/34] Update authelia-server.conf.sample --- root/defaults/nginx/authelia-server.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/authelia-server.conf.sample b/root/defaults/nginx/authelia-server.conf.sample index 742f21e..cbc1a86 100644 --- a/root/defaults/nginx/authelia-server.conf.sample +++ b/root/defaults/nginx/authelia-server.conf.sample @@ -1,6 +1,6 @@ ## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-server.conf.sample # Make sure that your authelia container is in the same user defined bridge network and is named authelia -# Rename /config/nginx/proxy-confs/authelia.conf.sample to /config/nginx/proxy-confs/authelia.conf +# Rename /config/nginx/proxy-confs/authelia.subdomain.conf.sample to /config/nginx/proxy-confs/authelia.subdomain.conf # Make sure that the authelia configuration.yml has 'path: "authelia"' defined # location for authelia subfolder requests From c9359819b619eb726e965f453e76359af40e8350 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 28 Mar 2023 21:38:56 -0500 Subject: [PATCH 12/34] 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 1c01a81..e336eba 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ azure-mgmt-core 1.3.2 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.12.0 python -boto3 1.26.99 python -botocore 1.29.99 python +boto3 1.26.101 python +botocore 1.29.101 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -88,7 +88,7 @@ dnspython 2.3.0 python domeneshop 0.4.3 python fail2ban 1.0.2 python fail2ban 1.0.2-r0 apk -filelock 3.10.4 python +filelock 3.10.7 python fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk future 0.18.3 python @@ -103,8 +103,8 @@ gnupg-utils 2.2.40-r0 apk gnupg-wks-client 2.2.40-r0 apk gnutls 3.7.8-r3 apk google-api-core 2.11.0 python -google-api-python-client 2.82.0 python -google-auth 2.16.3 python +google-api-python-client 2.83.0 python +google-auth 2.17.0 python google-auth-httplib2 0.1.0 python googleapis-common-protos 1.59.0 python gpg 2.2.40-r0 apk @@ -132,7 +132,7 @@ libavif 0.11.1-r0 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r1 apk +libcrypto3 3.0.8-r2 apk libcurl 7.88.1-r1 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk @@ -162,7 +162,7 @@ libsasl 2.1.28-r3 apk libseccomp 2.5.4-r0 apk libsm 1.2.3-r1 apk libsodium 1.0.18-r2 apk -libssl3 3.0.8-r1 apk +libssl3 3.0.8-r2 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libunistring 1.1-r0 apk @@ -293,7 +293,7 @@ portalocker 2.7.0 python procps 3.3.17-r2 apk protobuf 4.22.1 python publicsuffixlist 0.9.3 python -pyOpenSSL 23.1.0 python +pyOpenSSL 23.1.1 python pyRFC3339 1.1 python pyacmedns 0.4 python pyasn1 0.4.8 python From 6fcd80b17517e4ea29d6f1eef4affb6a790a8d05 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 29 Mar 2023 08:57:41 -0400 Subject: [PATCH 13/34] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index d2fa0e1..7a7eae6 100755 --- a/Dockerfile +++ b/Dockerfile @@ -159,6 +159,8 @@ RUN \ mkdir -p /defaults/fail2ban && \ mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ + echo "**** define allowipv6 to silence warning ****" && \ + sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban.conf && \ echo "**** copy proxy confs to /defaults ****" && \ mkdir -p \ /defaults/nginx/proxy-confs && \ From 0a919148ff9a931055496eaa82c52852a70c4f05 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 29 Mar 2023 08:58:11 -0400 Subject: [PATCH 14/34] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0b11152..db848f1 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -159,6 +159,8 @@ RUN \ mkdir -p /defaults/fail2ban && \ mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ + echo "**** define allowipv6 to silence warning ****" && \ + sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban.conf && \ echo "**** copy proxy confs to /defaults ****" && \ mkdir -p \ /defaults/nginx/proxy-confs && \ From e2731a12273d6a3e901b886bf6f55236036aa331 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 29 Mar 2023 08:58:30 -0400 Subject: [PATCH 15/34] Update Dockerfile.armhf --- Dockerfile.armhf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 84c8e33..f44b0c4 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -159,6 +159,8 @@ RUN \ mkdir -p /defaults/fail2ban && \ mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ + echo "**** define allowipv6 to silence warning ****" && \ + sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban.conf && \ echo "**** copy proxy confs to /defaults ****" && \ mkdir -p \ /defaults/nginx/proxy-confs && \ From 7e1758fde0f3ce0eda9926b7d0e156b1ae0589cf Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 29 Mar 2023 09:26:30 -0400 Subject: [PATCH 16/34] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7a7eae6..609208d 100755 --- a/Dockerfile +++ b/Dockerfile @@ -160,7 +160,7 @@ RUN \ mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ echo "**** define allowipv6 to silence warning ****" && \ - sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban.conf && \ + sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban/fail2ban.conf && \ echo "**** copy proxy confs to /defaults ****" && \ mkdir -p \ /defaults/nginx/proxy-confs && \ From 74828b1e8d5f93e7458451efce90855e9a76b862 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 29 Mar 2023 09:26:49 -0400 Subject: [PATCH 17/34] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index db848f1..4546b5f 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -160,7 +160,7 @@ RUN \ mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ echo "**** define allowipv6 to silence warning ****" && \ - sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban.conf && \ + sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban/fail2ban.conf && \ echo "**** copy proxy confs to /defaults ****" && \ mkdir -p \ /defaults/nginx/proxy-confs && \ From acef819cc18dd67c62c68fa4378bed2b1bb15e83 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 29 Mar 2023 09:27:12 -0400 Subject: [PATCH 18/34] Update Dockerfile.armhf --- Dockerfile.armhf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f44b0c4..1efd3f5 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -160,7 +160,7 @@ RUN \ mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ echo "**** define allowipv6 to silence warning ****" && \ - sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban.conf && \ + sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban/fail2ban.conf && \ echo "**** copy proxy confs to /defaults ****" && \ mkdir -p \ /defaults/nginx/proxy-confs && \ From a06bea000c73883b89fb0d1400f845f9a1770a91 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 29 Mar 2023 17:04:14 -0500 Subject: [PATCH 19/34] 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 e336eba..fb18c58 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ azure-mgmt-core 1.3.2 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.12.0 python -boto3 1.26.101 python -botocore 1.29.101 python +boto3 1.26.102 python +botocore 1.29.102 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -132,7 +132,7 @@ libavif 0.11.1-r0 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r2 apk +libcrypto3 3.0.8-r3 apk libcurl 7.88.1-r1 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk @@ -162,7 +162,7 @@ libsasl 2.1.28-r3 apk libseccomp 2.5.4-r0 apk libsm 1.2.3-r1 apk libsodium 1.0.18-r2 apk -libssl3 3.0.8-r2 apk +libssl3 3.0.8-r3 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libunistring 1.1-r0 apk @@ -305,7 +305,7 @@ python-dateutil 2.8.2 python python-digitalocean 1.17.0 python python-transip 0.6.0 python python3 3.10.10-r0 apk -pytz 2023.2 python +pytz 2023.3 python readline 8.2.0-r0 apk requests 2.28.2 python requests-file 1.5.1 python From 6619c4e0cdbefbb74f3caa63531c521c8945dbba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Apr 2023 11:54:58 -0500 Subject: [PATCH 20/34] Bot Updating Templated Files --- Jenkinsfile | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 146b4fb..b859cf3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,7 +57,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt' } script{ env.LS_RELEASE_NUMBER = sh( @@ -230,17 +230,14 @@ pipeline { } sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash - set -e - docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest docker run --rm \ - -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ - -e FILE_NAME="shellcheck-result.xml" \ - -e MIMETYPE="text/xml" \ - -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${S3_SECRET}\" \ - -e ACCESS_KEY=\"${S3_KEY}\" \ - -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ - python /upload.py''' + -v ${WORKSPACE}:/mnt \ + -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ + -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ + ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + apk add --no-cache py3-pip && \ + pip install s3cmd && \ + s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :''' } } } @@ -277,7 +274,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -294,7 +291,7 @@ pipeline { git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old templates" + echo "Deleting old and deprecated templates" rm -Rf ${TEMPDIR} exit 0 else From 17f70e4a3192432353a7e40b3ddbfada25d8c032 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Apr 2023 11:56:38 -0500 Subject: [PATCH 21/34] Bot Updating Templated Files --- .github/workflows/call_invalid_helper.yml | 12 ------------ .github/workflows/stale.yml | 23 ----------------------- 2 files changed, 35 deletions(-) delete mode 100644 .github/workflows/call_invalid_helper.yml delete mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml deleted file mode 100644 index 773767c..0000000 --- a/.github/workflows/call_invalid_helper.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Comment on invalid interaction -on: - issues: - types: - - labeled -jobs: - add-comment-on-invalid: - if: github.event.label.name == 'invalid' - permissions: - issues: write - uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 - secrets: inherit diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100644 index 73dfe45..0000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Mark stale issues and pull requests - -on: - schedule: - - cron: "30 1 * * *" - -jobs: - stale: - - runs-on: ubuntu-latest - - steps: - - uses: actions/stale@v6.0.1 - with: - stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." - stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." - stale-issue-label: 'no-issue-activity' - stale-pr-label: 'no-pr-activity' - days-before-stale: 30 - days-before-close: 365 - exempt-issue-labels: 'awaiting-approval,work-in-progress' - exempt-pr-labels: 'awaiting-approval,work-in-progress' - repo-token: ${{ secrets.GITHUB_TOKEN }} From dd17b24158c64d3ab6e2e404f81d7ee944f05613 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Apr 2023 11:58:17 -0500 Subject: [PATCH 22/34] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 14 ++++++++++++++ .github/workflows/call_issues_cron.yml | 13 +++++++++++++ .github/workflows/package_trigger_scheduler.yml | 2 +- .github/workflows/permissions.yml | 3 ++- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100755 .github/workflows/call_issue_pr_tracker.yml create mode 100755 .github/workflows/call_issues_cron.yml diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml new file mode 100755 index 0000000..87243e2 --- /dev/null +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -0,0 +1,14 @@ +name: Issue & PR Tracker + +on: + issues: + types: [opened,reopened,labeled,unlabeled] + pull_request_target: + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + +jobs: + manage-project: + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1 + secrets: inherit diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml new file mode 100755 index 0000000..244796f --- /dev/null +++ b/.github/workflows/call_issues_cron.yml @@ -0,0 +1,13 @@ +name: Mark stale issues and pull requests +on: + schedule: + - cron: '35 15 * * *' + workflow_dispatch: + +jobs: + stale: + permissions: + issues: write + pull-requests: write + uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1 + secrets: inherit diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index e439124..b92d6f4 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '03 5 * * 4' + - cron: '1 3 * * 6' workflow_dispatch: jobs: diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 2df6b61..1447bc5 100755 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -1,9 +1,10 @@ name: Permission check on: - pull_request: + pull_request_target: paths: - '**/run' - '**/finish' + - '**/check' jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 From 91d449259f1a484adc34ed0d84d9620ebe762ce5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Apr 2023 12:02:24 -0500 Subject: [PATCH 23/34] 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 fb18c58..9687906 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ NAME VERSION TYPE ConfigArgParse 1.5.3 python PyJWT 2.6.0 python PyYAML 6.0 python -acme 2.4.0 python +acme 2.5.0 python alpine-baselayout 3.4.0-r0 apk alpine-baselayout-data 3.4.0-r0 apk alpine-keys 2.4-r1 apk @@ -21,8 +21,8 @@ azure-mgmt-core 1.3.2 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.12.0 python -boto3 1.26.102 python -botocore 1.29.102 python +boto3 1.26.105 python +botocore 1.29.105 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -32,42 +32,42 @@ c-client 2007f-r14 apk ca-certificates 20220614-r4 apk ca-certificates-bundle 20220614-r4 apk cachetools 5.3.0 python -certbot 2.4.0 python +certbot 2.5.0 python certbot-dns-acmedns 0.1.0 python certbot-dns-aliyun 2.0.0 python certbot-dns-azure 2.1.0 python -certbot-dns-cloudflare 2.4.0 python +certbot-dns-cloudflare 2.5.0 python certbot-dns-cpanel 0.4.0 python certbot-dns-desec 1.2.1 python -certbot-dns-digitalocean 2.4.0 python +certbot-dns-digitalocean 2.5.0 python certbot-dns-directadmin 1.0.3 python -certbot-dns-dnsimple 2.4.0 python -certbot-dns-dnsmadeeasy 2.4.0 python +certbot-dns-dnsimple 2.5.0 python +certbot-dns-dnsmadeeasy 2.5.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-duckdns 1.3 python certbot-dns-dynu 0.0.4 python -certbot-dns-gehirn 2.4.0 python +certbot-dns-gehirn 2.5.0 python certbot-dns-godaddy 0.2.2 python -certbot-dns-google 2.4.0 python +certbot-dns-google 2.5.0 python certbot-dns-google-domains 0.1.9 python 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-linode 2.4.0 python +certbot-dns-linode 2.5.0 python certbot-dns-loopia 1.0.1 python -certbot-dns-luadns 2.4.0 python +certbot-dns-luadns 2.5.0 python certbot-dns-netcup 1.2.0 python certbot-dns-njalla 1.0.0 python -certbot-dns-nsone 2.4.0 python -certbot-dns-ovh 2.4.0 python +certbot-dns-nsone 2.5.0 python +certbot-dns-ovh 2.5.0 python certbot-dns-porkbun 0.8 python -certbot-dns-rfc2136 2.4.0 python -certbot-dns-route53 2.4.0 python -certbot-dns-sakuracloud 2.4.0 python +certbot-dns-rfc2136 2.5.0 python +certbot-dns-route53 2.5.0 python +certbot-dns-sakuracloud 2.5.0 python certbot-dns-standalone 1.1 python certbot-dns-transip 0.5.2 python certbot-dns-vultr 1.0.3 python @@ -104,7 +104,7 @@ gnupg-wks-client 2.2.40-r0 apk gnutls 3.7.8-r3 apk google-api-core 2.11.0 python google-api-python-client 2.83.0 python -google-auth 2.17.0 python +google-auth 2.17.1 python google-auth-httplib2 0.1.0 python googleapis-common-protos 1.59.0 python gpg 2.2.40-r0 apk @@ -224,7 +224,7 @@ npth 1.6-r2 apk oauth2client 4.1.3 python oauthlib 3.2.2 python oniguruma 6.9.8-r0 apk -openssl 3.0.8-r1 apk +openssl 3.0.8-r3 apk p11-kit 0.24.1-r1 apk packaging 23.0 python parsedatetime 2.6 python @@ -325,7 +325,7 @@ tiff 4.4.0-r3 apk tldextract 3.4.0 python typing-inspect 0.8.0 python typing_extensions 4.5.0 python -tzdata 2022f-r1 apk +tzdata 2023b-r1 apk unixodbc 2.3.11-r0 apk uritemplate 4.1.1 python urllib3 1.26.15 python From e72e9f6ed06318fddc6fe4441c9b531b63ea4677 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 4 Apr 2023 13:20:40 -0500 Subject: [PATCH 24/34] route53 no longer supports propagation Released in certbot 2.5.0 https://github.com/certbot/certbot/blob/df85c25da824ffd284a0d0b83ff4d9e2f60f4c82/certbot/CHANGELOG.md#changed --- 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 812042a..3d43f7a 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 @@ -274,7 +274,7 @@ if [[ "${VALIDATION}" = "dns" ]]; then DNSCREDENTIALSPARAM="" fi # plugins that don't support setting propagation - if [[ "${DNSPLUGIN}" =~ ^(azure|gandi|standalone)$ ]]; then + if [[ "${DNSPLUGIN}" =~ ^(azure|gandi|route53|standalone)$ ]]; then if [[ -n "${PROPAGATION}" ]]; then echo "${DNSPLUGIN} dns plugin does not support setting propagation time"; fi PROPAGATIONPARAM="" fi From 1d6a30144bdfaf12c58d4ce49e07a9b48fcbab97 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 5 Apr 2023 01:17:36 +0200 Subject: [PATCH 25/34] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9687906..60ea22d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ azure-mgmt-core 1.3.2 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.12.0 python -boto3 1.26.105 python -botocore 1.29.105 python +boto3 1.26.106 python +botocore 1.29.106 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary From 73938cb4a18540a6d5189633997c559ef1117c76 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Apr 2023 22:18:34 -0500 Subject: [PATCH 26/34] Bot Updating Package Versions --- package_versions.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 60ea22d..665a576 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ acme 2.5.0 python alpine-baselayout 3.4.0-r0 apk alpine-baselayout-data 3.4.0-r0 apk alpine-keys 2.4-r1 apk -alpine-release 3.17.2-r0 apk +alpine-release 3.17.3-r0 apk aom-libs 3.5.0-r0 apk apache2-utils 2.4.56-r0 apk apk-tools 2.12.10-r1 apk @@ -15,14 +15,14 @@ apr-util 1.6.3-r0 apk argon2-libs 20190702-r2 apk attrs 22.2.0 python azure-common 1.1.28 python -azure-core 1.26.3 python +azure-core 1.26.4 python azure-identity 1.12.0 python -azure-mgmt-core 1.3.2 python +azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk -beautifulsoup4 4.12.0 python -boto3 1.26.106 python -botocore 1.29.106 python +beautifulsoup4 4.12.2 python +boto3 1.26.109 python +botocore 1.29.109 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -88,7 +88,7 @@ dnspython 2.3.0 python domeneshop 0.4.3 python fail2ban 1.0.2 python fail2ban 1.0.2-r0 apk -filelock 3.10.7 python +filelock 3.11.0 python fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk future 0.18.3 python @@ -103,8 +103,8 @@ gnupg-utils 2.2.40-r0 apk gnupg-wks-client 2.2.40-r0 apk gnutls 3.7.8-r3 apk google-api-core 2.11.0 python -google-api-python-client 2.83.0 python -google-auth 2.17.1 python +google-api-python-client 2.84.0 python +google-auth 2.17.2 python google-auth-httplib2 0.1.0 python googleapis-common-protos 1.59.0 python gpg 2.2.40-r0 apk @@ -116,7 +116,7 @@ httplib2 0.22.0 python icu-data-en 72.1-r1 apk icu-libs 72.1-r1 apk idna 3.4 python -importlib-metadata 6.1.0 python +importlib-metadata 6.2.0 python ip6tables 1.8.8-r2 apk iptables 1.8.8-r2 apk isodate 0.6.1 python @@ -300,11 +300,11 @@ pyasn1 0.4.8 python pyasn1-modules 0.2.8 python pycparser 2.21 python pyparsing 3.0.9 python -python 3.10.10 binary +python 3.10.11 binary python-dateutil 2.8.2 python python-digitalocean 1.17.0 python python-transip 0.6.0 python -python3 3.10.10-r0 apk +python3 3.10.11-r0 apk pytz 2023.3 python readline 8.2.0-r0 apk requests 2.28.2 python @@ -325,7 +325,7 @@ tiff 4.4.0-r3 apk tldextract 3.4.0 python typing-inspect 0.8.0 python typing_extensions 4.5.0 python -tzdata 2023b-r1 apk +tzdata 2023c-r0 apk unixodbc 2.3.11-r0 apk uritemplate 4.1.1 python urllib3 1.26.15 python @@ -337,4 +337,4 @@ xz-libs 5.2.9-r0 apk zipp 3.15.0 python zlib 1.2.13-r0 apk zope.interface 6.0 python -zstd-libs 1.5.2-r9 apk +zstd-libs 1.5.5-r0 apk From 43a7239fbf8f105aeac59e175e7028840e1c271a Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 13 Apr 2023 11:06:12 -0500 Subject: [PATCH 27/34] Move ssl.conf include to default.conf --- README.md | 1 + readme-vars.yml | 1 + root/defaults/nginx/site-confs/default.conf.sample | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 28b753f..02431c8 100644 --- a/README.md +++ b/README.md @@ -336,6 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf and site-confs/default.conf - Move ssl.conf include to default.conf. * **25.03.23:** - Fix renewal post hook. * **10.03.23:** - Cleanup unused csr and keys folders. See [certbot 2.3.0 release notes](https://github.com/certbot/certbot/releases/tag/v2.3.0). * **09.03.23:** - Add Google Domains DNS support, `google-domains`. diff --git a/readme-vars.yml b/readme-vars.yml index ef33164..c074ec4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -154,6 +154,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf and site-confs/default.conf - Move ssl.conf include to default.conf." } - { date: "25.03.23:", desc: "Fix renewal post hook." } - { date: "10.03.23:", desc: "Cleanup unused csr and keys folders. See [certbot 2.3.0 release notes](https://github.com/certbot/certbot/releases/tag/v2.3.0)." } - { date: "09.03.23:", desc: "Add Google Domains DNS support, `google-domains`." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 10756f8..6bd2438 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/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample # redirect all traffic to https server { @@ -17,6 +17,8 @@ server { server_name _; + include /config/nginx/ssl.conf; + root /config/www; index index.html index.htm index.php; From 7a831681c5ca57e16a746653bf7b8fc30fb3dfcb Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 13 Apr 2023 11:26:13 -0500 Subject: [PATCH 28/34] Remove Authorization headers in authelia Sort proxy_set_header in authelia and authentik --- README.md | 2 +- readme-vars.yml | 2 +- root/defaults/nginx/authelia-location.conf.sample | 14 +++++--------- root/defaults/nginx/authentik-location.conf.sample | 10 +++++----- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 02431c8..290cdc0 100644 --- a/README.md +++ b/README.md @@ -336,7 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **13.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf and site-confs/default.conf - Move ssl.conf include to default.conf. +* **13.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik. * **25.03.23:** - Fix renewal post hook. * **10.03.23:** - Cleanup unused csr and keys folders. See [certbot 2.3.0 release notes](https://github.com/certbot/certbot/releases/tag/v2.3.0). * **09.03.23:** - Add Google Domains DNS support, `google-domains`. diff --git a/readme-vars.yml b/readme-vars.yml index c074ec4..cf36fab 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -154,7 +154,7 @@ app_setup_block: | # changelog changelogs: - - { date: "13.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf and site-confs/default.conf - Move ssl.conf include to default.conf." } + - { date: "13.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik." } - { date: "25.03.23:", desc: "Fix renewal post hook." } - { date: "10.03.23:", desc: "Cleanup unused csr and keys folders. See [certbot 2.3.0 release notes](https://github.com/certbot/certbot/releases/tag/v2.3.0)." } - { date: "09.03.23:", desc: "Add Google Domains DNS support, `google-domains`." } diff --git a/root/defaults/nginx/authelia-location.conf.sample b/root/defaults/nginx/authelia-location.conf.sample index 430b2f7..ae4d630 100644 --- a/root/defaults/nginx/authelia-location.conf.sample +++ b/root/defaults/nginx/authelia-location.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-location.conf.sample +## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-location.conf.sample # Make sure that your authelia container is in the same user defined bridge network and is named authelia # Rename /config/nginx/proxy-confs/authelia.subdomain.conf.sample to /config/nginx/proxy-confs/authelia.subdomain.conf # Make sure that the authelia configuration.yml has 'path: "authelia"' defined @@ -9,20 +9,16 @@ auth_request /authelia/api/verify; error_page 401 = @authelia_proxy_signin; ## Translate response headers from Authelia into variables -auth_request_set $user $upstream_http_remote_user; +auth_request_set $email $upstream_http_remote_email; auth_request_set $groups $upstream_http_remote_groups; auth_request_set $name $upstream_http_remote_name; -auth_request_set $email $upstream_http_remote_email; -auth_request_set $authorization $upstream_http_authorization; -auth_request_set $proxy_authorization $upstream_http_proxy_authorization; +auth_request_set $user $upstream_http_remote_user; ## Inject the response header variables into the request made to the actual upstream -proxy_set_header Remote-User $user; +proxy_set_header Remote-Email $email; proxy_set_header Remote-Groups $groups; proxy_set_header Remote-Name $name; -proxy_set_header Remote-Email $email; -proxy_set_header Authorization $authorization; -proxy_set_header Proxy-Authorization $proxy_authorization; +proxy_set_header Remote-User $user; ## Include the Set-Cookie header if present. auth_request_set $set_cookie $upstream_http_set_cookie; diff --git a/root/defaults/nginx/authentik-location.conf.sample b/root/defaults/nginx/authentik-location.conf.sample index 38001fe..39668c6 100644 --- a/root/defaults/nginx/authentik-location.conf.sample +++ b/root/defaults/nginx/authentik-location.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-location.conf.sample +## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-location.conf.sample # Make sure that your authentik container is in the same user defined bridge network and is named authentik-server # Rename /config/nginx/proxy-confs/authentik.subdomain.conf.sample to /config/nginx/proxy-confs/authentik.subdomain.conf @@ -8,18 +8,18 @@ auth_request /outpost.goauthentik.io/auth/nginx; error_page 401 = @goauthentik_proxy_signin; ## Translate response headers from Authentik into variables -auth_request_set $authentik_username $upstream_http_x_authentik_username; -auth_request_set $authentik_groups $upstream_http_x_authentik_groups; auth_request_set $authentik_email $upstream_http_x_authentik_email; +auth_request_set $authentik_groups $upstream_http_x_authentik_groups; auth_request_set $authentik_name $upstream_http_x_authentik_name; auth_request_set $authentik_uid $upstream_http_x_authentik_uid; +auth_request_set $authentik_username $upstream_http_x_authentik_username; ## Inject the response header variables into the request made to the actual upstream -proxy_set_header X-authentik-username $authentik_username; -proxy_set_header X-authentik-groups $authentik_groups; proxy_set_header X-authentik-email $authentik_email; +proxy_set_header X-authentik-groups $authentik_groups; proxy_set_header X-authentik-name $authentik_name; proxy_set_header X-authentik-uid $authentik_uid; +proxy_set_header X-authentik-username $authentik_username; ## Include the Set-Cookie header if present. auth_request_set $set_cookie $upstream_http_set_cookie; From 80705ccf1933a3b25172cdd8d92f126fa54362d3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 14 Apr 2023 22:19:09 -0500 Subject: [PATCH 29/34] Bot Updating Package Versions --- package_versions.txt | 104 +++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 665a576..584852e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ alpine-baselayout-data 3.4.0-r0 apk alpine-keys 2.4-r1 apk alpine-release 3.17.3-r0 apk aom-libs 3.5.0-r0 apk -apache2-utils 2.4.56-r0 apk +apache2-utils 2.4.57-r0 apk apk-tools 2.12.10-r1 apk apr 1.7.2-r0 apk apr-util 1.6.3-r0 apk @@ -21,8 +21,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.12.2 python -boto3 1.26.109 python -botocore 1.29.109 python +boto3 1.26.114 python +botocore 1.29.114 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -51,7 +51,7 @@ certbot-dns-dynu 0.0.4 python certbot-dns-gehirn 2.5.0 python certbot-dns-godaddy 0.2.2 python certbot-dns-google 2.5.0 python -certbot-dns-google-domains 0.1.9 python +certbot-dns-google-domains 0.1.11 python certbot-dns-he 1.0.0 python certbot-dns-hetzner 2.0.0 python certbot-dns-infomaniak 0.2.1 python @@ -78,7 +78,7 @@ charset-normalizer 3.1.0 python cloudflare 2.11.1 python configobj 5.0.8 python coreutils 9.1-r0 apk -cryptography 40.0.1 python +cryptography 40.0.2 python curl 7.88.1-r1 apk dataclasses-json 0.5.7 python distro 1.8.0 python @@ -103,8 +103,8 @@ gnupg-utils 2.2.40-r0 apk gnupg-wks-client 2.2.40-r0 apk gnutls 3.7.8-r3 apk google-api-core 2.11.0 python -google-api-python-client 2.84.0 python -google-auth 2.17.2 python +google-api-python-client 2.85.0 python +google-auth 2.17.3 python google-auth-httplib2 0.1.0 python googleapis-common-protos 1.59.0 python gpg 2.2.40-r0 apk @@ -116,7 +116,7 @@ httplib2 0.22.0 python icu-data-en 72.1-r1 apk icu-libs 72.1-r1 apk idna 3.4 python -importlib-metadata 6.2.0 python +importlib-metadata 6.3.0 python ip6tables 1.8.8-r2 apk iptables 1.8.8-r2 apk isodate 0.6.1 python @@ -133,7 +133,7 @@ libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcrypto3 3.0.8-r3 apk -libcurl 7.88.1-r1 apk +libcurl 8.0.1-r0 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk libevent 2.1.12-r5 apk @@ -173,7 +173,7 @@ libxau 1.0.10-r0 apk libxcb 1.15-r0 apk libxdmcp 1.1.4-r0 apk libxext 1.3.5-r0 apk -libxml2 2.10.3-r1 apk +libxml2 2.10.4-r0 apk libxpm 3.5.15-r0 apk libxslt 1.1.37-r1 apk libxt 1.2.1-r0 apk @@ -226,43 +226,43 @@ oauthlib 3.2.2 python oniguruma 6.9.8-r0 apk openssl 3.0.8-r3 apk p11-kit 0.24.1-r1 apk -packaging 23.0 python +packaging 23.1 python parsedatetime 2.6 python pcre 8.45-r2 apk pcre2 10.42-r0 apk perl 5.36.0-r0 apk perl-error 0.17029-r1 apk perl-git 2.38.4-r1 apk -php-cli 8.1.17 binary +php-cli 8.1.18 binary php-fpm 8.1.17 binary -php81 8.1.17-r0 apk -php81-bcmath 8.1.17-r0 apk -php81-bz2 8.1.17-r0 apk -php81-common 8.1.17-r0 apk -php81-ctype 8.1.17-r0 apk -php81-curl 8.1.17-r0 apk -php81-dom 8.1.17-r0 apk -php81-exif 8.1.17-r0 apk +php81 8.1.18-r0 apk +php81-bcmath 8.1.18-r0 apk +php81-bz2 8.1.18-r0 apk +php81-common 8.1.18-r0 apk +php81-ctype 8.1.18-r0 apk +php81-curl 8.1.18-r0 apk +php81-dom 8.1.18-r0 apk +php81-exif 8.1.18-r0 apk php81-fileinfo 8.1.17-r0 apk php81-fpm 8.1.17-r0 apk -php81-ftp 8.1.17-r0 apk -php81-gd 8.1.17-r0 apk -php81-gmp 8.1.17-r0 apk -php81-iconv 8.1.17-r0 apk -php81-imap 8.1.17-r0 apk -php81-intl 8.1.17-r0 apk -php81-ldap 8.1.17-r0 apk -php81-mbstring 8.1.17-r0 apk -php81-mysqli 8.1.17-r0 apk -php81-mysqlnd 8.1.17-r0 apk -php81-opcache 8.1.17-r0 apk -php81-openssl 8.1.17-r0 apk -php81-pdo 8.1.17-r0 apk -php81-pdo_mysql 8.1.17-r0 apk -php81-pdo_odbc 8.1.17-r0 apk -php81-pdo_pgsql 8.1.17-r0 apk -php81-pdo_sqlite 8.1.17-r0 apk -php81-pear 8.1.17-r0 apk +php81-ftp 8.1.18-r0 apk +php81-gd 8.1.18-r0 apk +php81-gmp 8.1.18-r0 apk +php81-iconv 8.1.18-r0 apk +php81-imap 8.1.18-r0 apk +php81-intl 8.1.18-r0 apk +php81-ldap 8.1.18-r0 apk +php81-mbstring 8.1.18-r0 apk +php81-mysqli 8.1.18-r0 apk +php81-mysqlnd 8.1.18-r0 apk +php81-opcache 8.1.18-r0 apk +php81-openssl 8.1.18-r0 apk +php81-pdo 8.1.18-r0 apk +php81-pdo_mysql 8.1.18-r0 apk +php81-pdo_odbc 8.1.18-r0 apk +php81-pdo_pgsql 8.1.18-r0 apk +php81-pdo_sqlite 8.1.18-r0 apk +php81-pear 8.1.18-r0 apk php81-pecl-apcu 5.1.22-r0 apk php81-pecl-igbinary 3.2.12-r0 apk php81-pecl-mailparse 3.1.4-r0 apk @@ -270,28 +270,28 @@ php81-pecl-mcrypt 1.0.6-r0 apk php81-pecl-memcached 3.2.0-r0 apk php81-pecl-redis 5.3.7-r0 apk php81-pecl-xmlrpc 1.0.0_rc3-r0 apk -php81-pgsql 8.1.17-r0 apk -php81-phar 8.1.17-r0 apk -php81-posix 8.1.17-r0 apk -php81-session 8.1.17-r0 apk +php81-pgsql 8.1.18-r0 apk +php81-phar 8.1.18-r0 apk +php81-posix 8.1.18-r0 apk +php81-session 8.1.18-r0 apk php81-simplexml 8.1.17-r0 apk -php81-soap 8.1.17-r0 apk -php81-sockets 8.1.17-r0 apk -php81-sodium 8.1.17-r0 apk -php81-sqlite3 8.1.17-r0 apk -php81-tokenizer 8.1.17-r0 apk -php81-xml 8.1.17-r0 apk -php81-xmlreader 8.1.17-r0 apk +php81-soap 8.1.18-r0 apk +php81-sockets 8.1.18-r0 apk +php81-sodium 8.1.18-r0 apk +php81-sqlite3 8.1.18-r0 apk +php81-tokenizer 8.1.18-r0 apk +php81-xml 8.1.18-r0 apk +php81-xmlreader 8.1.18-r0 apk php81-xmlwriter 8.1.17-r0 apk -php81-xsl 8.1.17-r0 apk -php81-zip 8.1.17-r0 apk +php81-xsl 8.1.18-r0 apk +php81-zip 8.1.18-r0 apk pinentry 1.2.1-r0 apk pip 23.0.1 python pkb-client 1.2 python popt 1.19-r0 apk portalocker 2.7.0 python procps 3.3.17-r2 apk -protobuf 4.22.1 python +protobuf 4.22.3 python publicsuffixlist 0.9.3 python pyOpenSSL 23.1.1 python pyRFC3339 1.1 python From 97e2720b9c89a3ab8dacca4611ce4bd853244b9a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 16 Apr 2023 23:53:59 +0000 Subject: [PATCH 30/34] 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 584852e..1b20630 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ apk-tools 2.12.10-r1 apk apr 1.7.2-r0 apk apr-util 1.6.3-r0 apk argon2-libs 20190702-r2 apk -attrs 22.2.0 python +attrs 23.1.0 python azure-common 1.1.28 python azure-core 1.26.4 python azure-identity 1.12.0 python @@ -79,7 +79,7 @@ cloudflare 2.11.1 python configobj 5.0.8 python coreutils 9.1-r0 apk cryptography 40.0.2 python -curl 7.88.1-r1 apk +curl 8.0.1-r0 apk dataclasses-json 0.5.7 python distro 1.8.0 python dns-lexicon 3.11.7 python @@ -116,7 +116,7 @@ httplib2 0.22.0 python icu-data-en 72.1-r1 apk icu-libs 72.1-r1 apk idna 3.4 python -importlib-metadata 6.3.0 python +importlib-metadata 6.4.1 python ip6tables 1.8.8-r2 apk iptables 1.8.8-r2 apk isodate 0.6.1 python @@ -187,7 +187,7 @@ marshmallow 3.19.0 python marshmallow-enum 1.5.1 python memcached 1.6.17 binary memcached 1.6.17-r0 apk -mock 5.0.1 python +mock 5.0.2 python mpdecimal 2.5.1-r1 apk msal 1.21.0 python msal-extensions 1.0.0 python @@ -234,7 +234,7 @@ perl 5.36.0-r0 apk perl-error 0.17029-r1 apk perl-git 2.38.4-r1 apk php-cli 8.1.18 binary -php-fpm 8.1.17 binary +php-fpm 8.1.18 binary php81 8.1.18-r0 apk php81-bcmath 8.1.18-r0 apk php81-bz2 8.1.18-r0 apk @@ -243,8 +243,8 @@ php81-ctype 8.1.18-r0 apk php81-curl 8.1.18-r0 apk php81-dom 8.1.18-r0 apk php81-exif 8.1.18-r0 apk -php81-fileinfo 8.1.17-r0 apk -php81-fpm 8.1.17-r0 apk +php81-fileinfo 8.1.18-r0 apk +php81-fpm 8.1.18-r0 apk php81-ftp 8.1.18-r0 apk php81-gd 8.1.18-r0 apk php81-gmp 8.1.18-r0 apk @@ -274,7 +274,7 @@ php81-pgsql 8.1.18-r0 apk php81-phar 8.1.18-r0 apk php81-posix 8.1.18-r0 apk php81-session 8.1.18-r0 apk -php81-simplexml 8.1.17-r0 apk +php81-simplexml 8.1.18-r0 apk php81-soap 8.1.18-r0 apk php81-sockets 8.1.18-r0 apk php81-sodium 8.1.18-r0 apk @@ -282,17 +282,17 @@ php81-sqlite3 8.1.18-r0 apk php81-tokenizer 8.1.18-r0 apk php81-xml 8.1.18-r0 apk php81-xmlreader 8.1.18-r0 apk -php81-xmlwriter 8.1.17-r0 apk +php81-xmlwriter 8.1.18-r0 apk php81-xsl 8.1.18-r0 apk php81-zip 8.1.18-r0 apk pinentry 1.2.1-r0 apk -pip 23.0.1 python +pip 23.1 python pkb-client 1.2 python popt 1.19-r0 apk portalocker 2.7.0 python procps 3.3.17-r2 apk protobuf 4.22.3 python -publicsuffixlist 0.9.3 python +publicsuffixlist 0.9.4 python pyOpenSSL 23.1.1 python pyRFC3339 1.1 python pyacmedns 0.4 python From eb0bcf14dd15b1e93bdd4fead64a748c8d837c73 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 16 Apr 2023 19:01:11 -0500 Subject: [PATCH 31/34] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1b20630..e949e2c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -318,7 +318,7 @@ setuptools 65.5.0 python shadow 4.13-r0 apk six 1.16.0 python skalibs 2.12.0.1-r0 apk -soupsieve 2.4 python +soupsieve 2.4.1 python sqlite-libs 3.40.1-r0 apk ssl_client 1.35.0-r29 apk tiff 4.4.0-r3 apk From 9357986f2713a9e33b43950abff905330bfed0bf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 18 Apr 2023 16:17:59 +0200 Subject: [PATCH 32/34] 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 e949e2c..60f306c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.12.2 python -boto3 1.26.114 python -botocore 1.29.114 python +boto3 1.26.115 python +botocore 1.29.115 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -103,7 +103,7 @@ gnupg-utils 2.2.40-r0 apk gnupg-wks-client 2.2.40-r0 apk gnutls 3.7.8-r3 apk google-api-core 2.11.0 python -google-api-python-client 2.85.0 python +google-api-python-client 2.86.0 python google-auth 2.17.3 python google-auth-httplib2 0.1.0 python googleapis-common-protos 1.59.0 python @@ -116,7 +116,7 @@ httplib2 0.22.0 python icu-data-en 72.1-r1 apk icu-libs 72.1-r1 apk idna 3.4 python -importlib-metadata 6.4.1 python +importlib-metadata 6.5.0 python ip6tables 1.8.8-r2 apk iptables 1.8.8-r2 apk isodate 0.6.1 python @@ -189,7 +189,7 @@ memcached 1.6.17 binary memcached 1.6.17-r0 apk mock 5.0.2 python mpdecimal 2.5.1-r1 apk -msal 1.21.0 python +msal 1.22.0 python msal-extensions 1.0.0 python msrest 0.7.1 python musl 1.2.3-r4 apk From cfb3fae7cfed9e990ef06791a6cb4a68d8fb7276 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 21 Apr 2023 18:28:44 +0000 Subject: [PATCH 33/34] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 60f306c..5a0333e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.12.2 python -boto3 1.26.115 python -botocore 1.29.115 python +boto3 1.26.117 python +botocore 1.29.117 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -88,7 +88,7 @@ dnspython 2.3.0 python domeneshop 0.4.3 python fail2ban 1.0.2 python fail2ban 1.0.2-r0 apk -filelock 3.11.0 python +filelock 3.12.0 python fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk future 0.18.3 python @@ -132,7 +132,7 @@ libavif 0.11.1-r0 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r3 apk +libcrypto3 3.0.8-r4 apk libcurl 8.0.1-r0 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk @@ -162,7 +162,7 @@ libsasl 2.1.28-r3 apk libseccomp 2.5.4-r0 apk libsm 1.2.3-r1 apk libsodium 1.0.18-r2 apk -libssl3 3.0.8-r3 apk +libssl3 3.0.8-r4 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libunistring 1.1-r0 apk @@ -224,13 +224,13 @@ npth 1.6-r2 apk oauth2client 4.1.3 python oauthlib 3.2.2 python oniguruma 6.9.8-r0 apk -openssl 3.0.8-r3 apk +openssl 3.0.8-r4 apk p11-kit 0.24.1-r1 apk packaging 23.1 python parsedatetime 2.6 python pcre 8.45-r2 apk pcre2 10.42-r0 apk -perl 5.36.0-r0 apk +perl 5.36.0-r1 apk perl-error 0.17029-r1 apk perl-git 2.38.4-r1 apk php-cli 8.1.18 binary @@ -296,8 +296,8 @@ publicsuffixlist 0.9.4 python pyOpenSSL 23.1.1 python pyRFC3339 1.1 python pyacmedns 0.4 python -pyasn1 0.4.8 python -pyasn1-modules 0.2.8 python +pyasn1 0.5.0 python +pyasn1-modules 0.3.0 python pycparser 2.21 python pyparsing 3.0.9 python python 3.10.11 binary From 2f740e60a8634555caa6bb389b04685158f9cde5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 22 Apr 2023 03:17:40 +0000 Subject: [PATCH 34/34] 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 5a0333e..7852381 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.0.0 python bash 5.2.15-r0 apk beautifulsoup4 4.12.2 python -boto3 1.26.117 python -botocore 1.29.117 python +boto3 1.26.118 python +botocore 1.29.118 python brotli-libs 1.0.9-r9 apk bs4 0.0.1 python busybox 1.35.0 binary @@ -116,7 +116,7 @@ httplib2 0.22.0 python icu-data-en 72.1-r1 apk icu-libs 72.1-r1 apk idna 3.4 python -importlib-metadata 6.5.0 python +importlib-metadata 6.5.1 python ip6tables 1.8.8-r2 apk iptables 1.8.8-r2 apk isodate 0.6.1 python