Compare commits

...

7 Commits

Author SHA1 Message Date
LinuxServer-CI
94c72584a7 Bot Updating Package Versions 2024-09-21 03:21:56 +00:00
LinuxServer-CI
59d1c8a724 Bot Updating Package Versions 2024-09-14 03:24:17 +00:00
LinuxServer-CI
ed0c949267 Bot Updating Package Versions 2024-09-07 03:22:04 +00:00
LinuxServer-CI
5027f6f7b3 Bot Updating Package Versions 2024-09-02 20:56:29 +00:00
aptalca
502d10303c Merge pull request #503 from linuxserver/zerossl-revoke
fix zerossl cert revocation
2024-09-02 16:53:07 -04:00
LinuxServer-CI
05bccb95ab Bot Updating Package Versions 2024-08-31 03:22:26 +00:00
aptalca
00afe35e21 fix zerossl cert revocation 2024-08-30 13:15:22 -04:00
4 changed files with 46 additions and 52 deletions

View File

@@ -400,6 +400,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **30.08.24:** - Fix zerossl cert revocation.
* **24.07.14:** - Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings. * **24.07.14:** - Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings.
* **01.07.24:** - Fall back to iptables-legacy if iptables doesn't work. * **01.07.24:** - Fall back to iptables-legacy if iptables doesn't work.
* **23.03.24:** - Fix perms on the generated `priv-fullchain-bundle.pem`. * **23.03.24:** - Fix perms on the generated `priv-fullchain-bundle.pem`.

View File

@@ -4,25 +4,25 @@ acme 2.11.0 python
alpine-baselayout 3.6.5-r0 apk alpine-baselayout 3.6.5-r0 apk
alpine-baselayout-data 3.6.5-r0 apk alpine-baselayout-data 3.6.5-r0 apk
alpine-keys 2.4-r1 apk alpine-keys 2.4-r1 apk
alpine-release 3.20.2-r0 apk alpine-release 3.20.3-r0 apk
aom-libs 3.9.1-r0 apk aom-libs 3.9.1-r0 apk
apache2-utils 2.4.62-r0 apk apache2-utils 2.4.62-r0 apk
apk-tools 2.14.4-r0 apk apk-tools 2.14.4-r0 apk
apr 1.7.4-r0 apk apr 1.7.5-r0 apk
apr-util 1.6.3-r1 apk apr-util 1.6.3-r1 apk
argon2-libs 20190702-r5 apk argon2-libs 20190702-r5 apk
attrs 24.2.0 python attrs 24.2.0 python
autocommand 2.2.2 python autocommand 2.2.2 python
azure-common 1.1.28 python azure-common 1.1.28 python
azure-core 1.30.2 python azure-core 1.31.0 python
azure-identity 1.17.1 python azure-identity 1.18.0 python
azure-mgmt-core 1.4.0 python azure-mgmt-core 1.4.0 python
azure-mgmt-dns 8.1.0 python azure-mgmt-dns 8.1.0 python
backports-tarfile 1.2.0 python backports-tarfile 1.2.0 python
bash 5.2.26-r0 apk bash 5.2.26-r0 apk
beautifulsoup4 4.12.3 python beautifulsoup4 4.12.3 python
boto3 1.35.5 python boto3 1.35.24 python
botocore 1.35.5 python botocore 1.35.24 python
brotli-libs 1.1.0-r2 apk brotli-libs 1.1.0-r2 apk
bs4 0.0.2 python bs4 0.0.2 python
busybox 1.36.1-r29 apk busybox 1.36.1-r29 apk
@@ -77,19 +77,19 @@ certbot-dns-standalone 1.1 python
certbot-dns-transip 0.5.2 python certbot-dns-transip 0.5.2 python
certbot-dns-vultr 1.1.0 python certbot-dns-vultr 1.1.0 python
certbot-plugin-gandi 1.5.0 python certbot-plugin-gandi 1.5.0 python
certifi 2024.7.4 python certifi 2024.8.30 python
cffi 1.17.0 python cffi 1.17.1 python
charset-normalizer 3.3.2 python charset-normalizer 3.3.2 python
cloudflare 2.19.4 python cloudflare 2.19.4 python
composer 2.7.8 binary composer 2.7.9 binary
configargparse 1.7 python configargparse 1.7 python
configobj 5.0.8 python configobj 5.0.8 python
coreutils 9.5-r1 apk coreutils 9.5-r1 apk
coreutils-env 9.5-r1 apk coreutils-env 9.5-r1 apk
coreutils-fmt 9.5-r1 apk coreutils-fmt 9.5-r1 apk
coreutils-sha512sum 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk
cryptography 43.0.0 python cryptography 43.0.1 python
curl 8.9.0-r0 apk curl 8.10.0-r0 apk
distro 1.9.0 python distro 1.9.0 python
dns-lexicon 3.18.0 python dns-lexicon 3.18.0 python
dnslib 0.9.25 python dnslib 0.9.25 python
@@ -98,7 +98,7 @@ domeneshop 0.4.4 python
fail2ban 1.1.0 python fail2ban 1.1.0 python
fail2ban 1.1.0-r0 apk fail2ban 1.1.0-r0 apk
fail2ban-pyc 1.1.0-r0 apk fail2ban-pyc 1.1.0-r0 apk
filelock 3.15.4 python filelock 3.16.1 python
findutils 4.9.0-r5 apk findutils 4.9.0-r5 apk
fontconfig 2.15.0-r1 apk fontconfig 2.15.0-r1 apk
freetype 2.13.2-r0 apk freetype 2.13.2-r0 apk
@@ -115,11 +115,11 @@ gnupg-keyboxd 2.4.5-r0 apk
gnupg-utils 2.4.5-r0 apk gnupg-utils 2.4.5-r0 apk
gnupg-wks-client 2.4.5-r0 apk gnupg-wks-client 2.4.5-r0 apk
gnutls 3.8.5-r0 apk gnutls 3.8.5-r0 apk
google-api-core 2.19.1 python google-api-core 2.20.0 python
google-api-python-client 2.142.0 python google-api-python-client 2.146.0 python
google-auth 2.34.0 python google-auth 2.35.0 python
google-auth-httplib2 0.2.0 python google-auth-httplib2 0.2.0 python
googleapis-common-protos 1.63.2 python googleapis-common-protos 1.65.0 python
gpg 2.4.5-r0 apk gpg 2.4.5-r0 apk
gpg-agent 2.4.5-r0 apk gpg-agent 2.4.5-r0 apk
gpg-wks-server 2.4.5-r0 apk gpg-wks-server 2.4.5-r0 apk
@@ -128,13 +128,14 @@ gpgv 2.4.5-r0 apk
httplib2 0.22.0 python httplib2 0.22.0 python
icu-data-en 74.2-r0 apk icu-data-en 74.2-r0 apk
icu-libs 74.2-r0 apk icu-libs 74.2-r0 apk
idna 3.8 python idna 3.10 python
importlib-metadata 8.0.0 python importlib-metadata 8.0.0 python
importlib-resources 6.4.0 python importlib-resources 6.4.0 python
inflect 7.3.1 python inflect 7.3.1 python
iptables 1.8.10-r3 apk iptables 1.8.10-r3 apk
iptables-legacy 1.8.10-r3 apk iptables-legacy 1.8.10-r3 apk
isodate 0.6.1 python isodate 0.6.1 python
jaraco-collections 5.1.0 python
jaraco-context 5.3.0 python jaraco-context 5.3.0 python
jaraco-functools 4.0.1 python jaraco-functools 4.0.1 python
jaraco-text 3.12.1 python jaraco-text 3.12.1 python
@@ -142,19 +143,19 @@ jmespath 1.0.1 python
josepy 1.14.0 python josepy 1.14.0 python
jq 1.7.1-r0 apk jq 1.7.1-r0 apk
jsonlines 4.0.0 python jsonlines 4.0.0 python
jsonpickle 3.2.2 python jsonpickle 3.3.0 python
libacl 2.3.2-r0 apk libacl 2.3.2-r0 apk
libassuan 2.5.7-r0 apk libassuan 2.5.7-r0 apk
libattr 2.5.2-r0 apk libattr 2.5.2-r0 apk
libavif 1.0.4-r0 apk libavif 1.0.4-r0 apk
libbsd 0.12.2-r0 apk libbsd 0.12.2-r0 apk
libbz2 1.0.8-r6 apk libbz2 1.0.8-r6 apk
libcrypto3 3.3.1-r3 apk libcrypto3 3.3.2-r0 apk
libcurl 8.9.0-r0 apk libcurl 8.10.0-r0 apk
libdav1d 1.4.2-r0 apk libdav1d 1.4.2-r0 apk
libedit 20240517.3.1-r0 apk libedit 20240517.3.1-r0 apk
libevent 2.1.12-r7 apk libevent 2.1.12-r7 apk
libexpat 2.6.2-r0 apk libexpat 2.6.3-r0 apk
libffi 3.4.6-r0 apk libffi 3.4.6-r0 apk
libgcc 13.2.1_git20240309-r0 apk libgcc 13.2.1_git20240309-r0 apk
libgcrypt 1.10.3-r0 apk libgcrypt 1.10.3-r0 apk
@@ -173,10 +174,10 @@ libmcrypt 2.5.8-r10 apk
libmd 1.1.0-r0 apk libmd 1.1.0-r0 apk
libmemcached-libs 1.1.4-r1 apk libmemcached-libs 1.1.4-r1 apk
libmnl 1.0.5-r2 apk libmnl 1.0.5-r2 apk
libncursesw 6.4_p20240420-r0 apk libncursesw 6.4_p20240420-r1 apk
libnftnl 1.2.6-r0 apk libnftnl 1.2.6-r0 apk
libpanelw 6.4_p20240420-r0 apk libpanelw 6.4_p20240420-r1 apk
libpng 1.6.43-r0 apk libpng 1.6.44-r0 apk
libpq 16.3-r0 apk libpq 16.3-r0 apk
libproc2 4.0.4-r0 apk libproc2 4.0.4-r0 apk
libpsl 0.21.5-r1 apk libpsl 0.21.5-r1 apk
@@ -185,7 +186,7 @@ libseccomp 2.5.5-r1 apk
libsharpyuv 1.3.2-r0 apk libsharpyuv 1.3.2-r0 apk
libsm 1.2.4-r4 apk libsm 1.2.4-r4 apk
libsodium 1.0.19-r0 apk libsodium 1.0.19-r0 apk
libssl3 3.3.1-r3 apk libssl3 3.3.2-r0 apk
libstdc++ 13.2.1_git20240309-r0 apk libstdc++ 13.2.1_git20240309-r0 apk
libtasn1 4.19.0-r2 apk libtasn1 4.19.0-r2 apk
libunistring 1.2-r0 apk libunistring 1.2-r0 apk
@@ -211,13 +212,13 @@ memcached 1.6.27-r0 apk
mock 5.1.0 python mock 5.1.0 python
more-itertools 10.3.0 python more-itertools 10.3.0 python
mpdecimal 4.0.0-r0 apk mpdecimal 4.0.0-r0 apk
msal 1.30.0 python msal 1.31.0 python
msal-extensions 1.2.0 python msal-extensions 1.2.0 python
musl 1.2.5-r0 apk musl 1.2.5-r0 apk
musl-utils 1.2.5-r0 apk musl-utils 1.2.5-r0 apk
my-test-package 1.0 python my-test-package 1.0 python
nano 8.0-r0 apk nano 8.0-r0 apk
ncurses-terminfo-base 6.4_p20240420-r0 apk ncurses-terminfo-base 6.4_p20240420-r1 apk
netcat-openbsd 1.226-r0 apk netcat-openbsd 1.226-r0 apk
nettle 3.9.1-r0 apk nettle 3.9.1-r0 apk
nghttp2-libs 1.62.1-r0 apk nghttp2-libs 1.62.1-r0 apk
@@ -242,7 +243,7 @@ nginx-mod-stream-geoip2 1.26.2-r0 apk
nginx-vim 1.26.2-r0 apk nginx-vim 1.26.2-r0 apk
npth 1.6-r4 apk npth 1.6-r4 apk
oniguruma 6.9.9-r0 apk oniguruma 6.9.9-r0 apk
openssl 3.3.1-r3 apk openssl 3.3.2-r0 apk
p11-kit 0.25.3-r0 apk p11-kit 0.25.3-r0 apk
packaging 24.1 python packaging 24.1 python
parsedatetime 2.6 python parsedatetime 2.6 python
@@ -308,25 +309,25 @@ popt 1.19-r3 apk
portalocker 2.10.1 python portalocker 2.10.1 python
procps-ng 4.0.4-r0 apk procps-ng 4.0.4-r0 apk
proto-plus 1.24.0 python proto-plus 1.24.0 python
protobuf 5.27.3 python protobuf 5.28.2 python
pyacmedns 0.4 python pyacmedns 0.4 python
pyasn1 0.6.0 python pyasn1 0.6.1 python
pyasn1-modules 0.4.0 python pyasn1-modules 0.4.1 python
pyc 3.12.3-r2 apk pyc 3.12.6-r0 apk
pycparser 2.22 python pycparser 2.22 python
pyjwt 2.9.0 python pyjwt 2.9.0 python
pynamecheap 0.0.3 python pynamecheap 0.0.3 python
pyopenssl 24.2.1 python pyopenssl 24.2.1 python
pyotp 2.9.0 python pyotp 2.9.0 python
pyparsing 3.1.2 python pyparsing 3.1.4 python
pyrfc3339 1.1 python pyrfc3339 1.1 python
python-dateutil 2.9.0.post0 python python-dateutil 2.9.0.post0 python
python-digitalocean 1.17.0 python python-digitalocean 1.17.0 python
python-transip 0.6.0 python python-transip 0.6.0 python
python3 3.12.3-r2 apk python3 3.12.6-r0 apk
python3-pyc 3.12.3-r2 apk python3-pyc 3.12.6-r0 apk
python3-pycache-pyc0 3.12.3-r2 apk python3-pycache-pyc0 3.12.6-r0 apk
pytz 2024.1 python pytz 2024.2 python
pyyaml 6.0.2 python pyyaml 6.0.2 python
readline 8.2.10-r0 apk readline 8.2.10-r0 apk
requests 2.32.3 python requests 2.32.3 python
@@ -335,7 +336,7 @@ requests-mock 1.12.1 python
rsa 4.9 python rsa 4.9 python
s3transfer 0.10.2 python s3transfer 0.10.2 python
scanelf 1.3.7-r2 apk scanelf 1.3.7-r2 apk
setuptools 73.0.1 python setuptools 75.1.0 python
shadow 4.15.1-r0 apk shadow 4.15.1-r0 apk
six 1.16.0 python six 1.16.0 python
skalibs 2.14.1.1-r0 apk skalibs 2.14.1.1-r0 apk
@@ -347,10 +348,10 @@ tldextract 5.1.2 python
tomli 2.0.1 python tomli 2.0.1 python
typeguard 4.3.0 python typeguard 4.3.0 python
typing-extensions 4.12.2 python (+1 duplicate) typing-extensions 4.12.2 python (+1 duplicate)
tzdata 2024a-r1 apk tzdata 2024b-r0 apk
unixodbc 2.3.12-r0 apk unixodbc 2.3.12-r0 apk
uritemplate 4.1.1 python uritemplate 4.1.1 python
urllib3 2.2.2 python urllib3 2.2.3 python
utmps-libs 0.1.2.2-r1 apk utmps-libs 0.1.2.2-r1 apk
wheel 0.43.0 python wheel 0.43.0 python
wheel 0.44.0 python wheel 0.44.0 python
@@ -358,5 +359,5 @@ whois 5.5.23-r0 apk
xz-libs 5.6.2-r0 apk xz-libs 5.6.2-r0 apk
zipp 3.19.2 python zipp 3.19.2 python
zlib 1.3.1-r1 apk zlib 1.3.1-r1 apk
zope-interface 7.0.1 python zope-interface 7.0.3 python
zstd-libs 1.5.6-r0 apk zstd-libs 1.5.6-r0 apk

View File

@@ -140,6 +140,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "30.08.24:", desc: "Fix zerossl cert revocation." }
- { date: "24.07.14:", desc: "Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - { date: "24.07.14:", desc: "Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
- { date: "01.07.24:", desc: "Fall back to iptables-legacy if iptables doesn't work." } - { date: "01.07.24:", desc: "Fall back to iptables-legacy if iptables doesn't work." }
- { date: "23.03.24:", desc: "Fix perms on the generated `priv-fullchain-bundle.pem`." } - { date: "23.03.24:", desc: "Fix perms on the generated `priv-fullchain-bundle.pem`." }

View File

@@ -189,24 +189,15 @@ if [[ ! "${URL}" = "${ORIGURL}" ]] ||
[[ ! "${STAGING}" = "${ORIGSTAGING}" ]] || [[ ! "${STAGING}" = "${ORIGSTAGING}" ]] ||
[[ ! "${CERTPROVIDER}" = "${ORIGCERTPROVIDER}" ]]; then [[ ! "${CERTPROVIDER}" = "${ORIGCERTPROVIDER}" ]]; then
echo "Different validation parameters entered than what was used before. Revoking and deleting existing certificate, and an updated one will be created" echo "Different validation parameters entered than what was used before. Revoking and deleting existing certificate, and an updated one will be created"
if [[ "${ORIGCERTPROVIDER}" = "zerossl" ]] && [[ -n "${ORIGEMAIL}" ]]; then if [[ "${ORIGCERTPROVIDER}" = "zerossl" ]]; then
REV_ACMESERVER=("https://acme.zerossl.com/v2/DV90") REV_ACMESERVER=("https://acme.zerossl.com/v2/DV90")
REV_ZEROSSL_EAB_KID=$(awk -F "=" '/eab-kid/ {print $2}' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" | tr -d ' ')
REV_ZEROSSL_EAB_HMAC_KEY=$(awk -F "=" '/eab-hmac-key/ {print $2}' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" | tr -d ' ')
if [[ -z "${REV_ZEROSSL_EAB_KID}" ]] || [[ -z "${REV_ZEROSSL_EAB_HMAC_KEY}" ]]; then
REV_ZEROSSL_EAB_KID=$(awk -F "=" '/eab-kid/ {print $2}' /config/etc/letsencrypt/cli.ini | tr -d ' ')
REV_ZEROSSL_EAB_HMAC_KEY=$(awk -F "=" '/eab-hmac-key/ {print $2}' /config/etc/letsencrypt/cli.ini | tr -d ' ')
fi
if [[ -n "${REV_ZEROSSL_EAB_KID}" ]] && [[ -n "${REV_ZEROSSL_EAB_HMAC_KEY}" ]]; then
REV_ACMESERVER+=("--eab-kid" "${REV_ZEROSSL_EAB_KID}" "--eab-hmac-key" "${REV_ZEROSSL_EAB_HMAC_KEY}")
fi
elif [[ "${ORIGSTAGING}" = "true" ]]; then elif [[ "${ORIGSTAGING}" = "true" ]]; then
REV_ACMESERVER=("https://acme-staging-v02.api.letsencrypt.org/directory") REV_ACMESERVER=("https://acme-staging-v02.api.letsencrypt.org/directory")
else else
REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory") REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory")
fi fi
if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then 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 certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --key-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/privkey.pem --server "${REV_ACMESERVER[@]}" || true
else else
certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
fi fi