Compare commits

...

3 Commits

Author SHA1 Message Date
LinuxServer-CI
70c66c5495 Bot Updating Package Versions 2023-03-25 18:02:53 +01:00
Eric Nemchik
430308342f Merge pull request #354 from linuxserver/hook
Fix renewal post hook
2023-03-25 11:58:50 -05:00
Eric Nemchik
97222fbb25 Fix renewal post hook 2023-03-25 11:32:25 -05:00
5 changed files with 19 additions and 16 deletions

View File

@@ -336,6 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## 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). * **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`. * **09.03.23:** - Add Google Domains DNS support, `google-domains`.
* **02.03.23:** - Set permissions on crontabs during init. * **02.03.23:** - Set permissions on crontabs during init.

View File

@@ -21,8 +21,8 @@ azure-mgmt-core 1.3.2 python
azure-mgmt-dns 8.0.0 python azure-mgmt-dns 8.0.0 python
bash 5.2.15-r0 apk bash 5.2.15-r0 apk
beautifulsoup4 4.12.0 python beautifulsoup4 4.12.0 python
boto3 1.26.97 python boto3 1.26.99 python
botocore 1.29.97 python botocore 1.29.99 python
brotli-libs 1.0.9-r9 apk brotli-libs 1.0.9-r9 apk
bs4 0.0.1 python bs4 0.0.1 python
busybox 1.35.0 binary 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-gehirn 2.4.0 python
certbot-dns-godaddy 0.2.2 python certbot-dns-godaddy 0.2.2 python
certbot-dns-google 2.4.0 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-he 1.0.0 python
certbot-dns-hetzner 2.0.0 python certbot-dns-hetzner 2.0.0 python
certbot-dns-infomaniak 0.2.1 python certbot-dns-infomaniak 0.2.1 python
@@ -78,8 +78,8 @@ charset-normalizer 3.1.0 python
cloudflare 2.11.1 python cloudflare 2.11.1 python
configobj 5.0.8 python configobj 5.0.8 python
coreutils 9.1-r0 apk coreutils 9.1-r0 apk
cryptography 39.0.2 python cryptography 40.0.1 python
curl 7.88.1-r0 apk curl 7.88.1-r1 apk
dataclasses-json 0.5.7 python dataclasses-json 0.5.7 python
distro 1.8.0 python distro 1.8.0 python
dns-lexicon 3.11.7 python dns-lexicon 3.11.7 python
@@ -88,7 +88,7 @@ dnspython 2.3.0 python
domeneshop 0.4.3 python domeneshop 0.4.3 python
fail2ban 1.0.2 python fail2ban 1.0.2 python
fail2ban 1.0.2-r0 apk fail2ban 1.0.2-r0 apk
filelock 3.10.2 python filelock 3.10.4 python
fontconfig 2.14.1-r0 apk fontconfig 2.14.1-r0 apk
freetype 2.12.1-r0 apk freetype 2.12.1-r0 apk
future 0.18.3 python future 0.18.3 python
@@ -104,7 +104,7 @@ gnupg-wks-client 2.2.40-r0 apk
gnutls 3.7.8-r3 apk gnutls 3.7.8-r3 apk
google-api-core 2.11.0 python google-api-core 2.11.0 python
google-api-python-client 2.82.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 google-auth-httplib2 0.1.0 python
googleapis-common-protos 1.59.0 python googleapis-common-protos 1.59.0 python
gpg 2.2.40-r0 apk gpg 2.2.40-r0 apk
@@ -224,7 +224,7 @@ npth 1.6-r2 apk
oauth2client 4.1.3 python oauth2client 4.1.3 python
oauthlib 3.2.2 python oauthlib 3.2.2 python
oniguruma 6.9.8-r0 apk 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 p11-kit 0.24.1-r1 apk
packaging 23.0 python packaging 23.0 python
parsedatetime 2.6 python parsedatetime 2.6 python
@@ -234,7 +234,7 @@ perl 5.36.0-r0 apk
perl-error 0.17029-r1 apk perl-error 0.17029-r1 apk
perl-git 2.38.4-r1 apk perl-git 2.38.4-r1 apk
php-cli 8.1.17 binary 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 8.1.17-r0 apk
php81-bcmath 8.1.17-r0 apk php81-bcmath 8.1.17-r0 apk
php81-bz2 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-curl 8.1.17-r0 apk
php81-dom 8.1.17-r0 apk php81-dom 8.1.17-r0 apk
php81-exif 8.1.17-r0 apk php81-exif 8.1.17-r0 apk
php81-fileinfo 8.1.16-r0 apk php81-fileinfo 8.1.17-r0 apk
php81-fpm 8.1.16-r0 apk php81-fpm 8.1.17-r0 apk
php81-ftp 8.1.17-r0 apk php81-ftp 8.1.17-r0 apk
php81-gd 8.1.17-r0 apk php81-gd 8.1.17-r0 apk
php81-gmp 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-phar 8.1.17-r0 apk
php81-posix 8.1.17-r0 apk php81-posix 8.1.17-r0 apk
php81-session 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-soap 8.1.17-r0 apk
php81-sockets 8.1.17-r0 apk php81-sockets 8.1.17-r0 apk
php81-sodium 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-tokenizer 8.1.17-r0 apk
php81-xml 8.1.17-r0 apk php81-xml 8.1.17-r0 apk
php81-xmlreader 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-xsl 8.1.17-r0 apk
php81-zip 8.1.17-r0 apk php81-zip 8.1.17-r0 apk
pinentry 1.2.1-r0 apk pinentry 1.2.1-r0 apk
@@ -293,7 +293,7 @@ portalocker 2.7.0 python
procps 3.3.17-r2 apk procps 3.3.17-r2 apk
protobuf 4.22.1 python protobuf 4.22.1 python
publicsuffixlist 0.9.3 python publicsuffixlist 0.9.3 python
pyOpenSSL 23.0.0 python pyOpenSSL 23.1.0 python
pyRFC3339 1.1 python pyRFC3339 1.1 python
pyacmedns 0.4 python pyacmedns 0.4 python
pyasn1 0.4.8 python pyasn1 0.4.8 python
@@ -305,7 +305,7 @@ python-dateutil 2.8.2 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.10.10-r0 apk python3 3.10.10-r0 apk
pytz 2022.7.1 python pytz 2023.2 python
readline 8.2.0-r0 apk readline 8.2.0-r0 apk
requests 2.28.2 python requests 2.28.2 python
requests-file 1.5.1 python requests-file 1.5.1 python

View File

@@ -154,6 +154,7 @@ app_setup_block: |
# changelog # changelog
changelogs: 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: "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: "09.03.23:", desc: "Add Google Domains DNS support, `google-domains`." }
- { date: "02.03.23:", desc: "Set permissions on crontabs during init." } - { date: "02.03.23:", desc: "Set permissions on crontabs during init." }

View File

@@ -5,7 +5,7 @@
. /config/.donoteditthisfile.conf . /config/.donoteditthisfile.conf
if [[ ! "${ORIGVALIDATION}" = "dns" ]] && [[ ! "${ORIGVALIDATION}" = "duckdns" ]]; then 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 s6-svc -u /run/service/svc-nginx
fi fi
else else

View File

@@ -41,6 +41,7 @@ lsiown -R abc:abc /config/etc/letsencrypt/renewal-hooks
# replace nginx service location in 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|/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|/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 # create original config file if it doesn't exist, move non-hidden legacy file to hidden
if [[ -f "/config/donoteditthisfile.conf" ]]; then if [[ -f "/config/donoteditthisfile.conf" ]]; then