mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-07 18:55:15 +09:00
Compare commits
2 Commits
2.11.0-ls3
...
renewal-ho
| Author | SHA1 | Date | |
|---|---|---|---|
|
732b6d1bf1 | ||
|
|
0c3bc63349 |
@@ -131,7 +131,7 @@ RUN \
|
||||
certbot-dns-transip \
|
||||
certbot-dns-vultr \
|
||||
certbot-plugin-gandi \
|
||||
cryptography \
|
||||
cryptography==42.0.7 \
|
||||
future \
|
||||
requests && \
|
||||
echo "**** enable OCSP stapling from base ****" && \
|
||||
|
||||
@@ -131,7 +131,7 @@ RUN \
|
||||
certbot-dns-transip \
|
||||
certbot-dns-vultr \
|
||||
certbot-plugin-gandi \
|
||||
cryptography \
|
||||
cryptography==42.0.7 \
|
||||
future \
|
||||
requests && \
|
||||
echo "**** enable OCSP stapling from base ****" && \
|
||||
|
||||
@@ -4,7 +4,7 @@ acme 2.11.0 python
|
||||
alpine-baselayout 3.6.5-r0 apk
|
||||
alpine-baselayout-data 3.6.5-r0 apk
|
||||
alpine-keys 2.4-r1 apk
|
||||
alpine-release 3.20.3-r0 apk
|
||||
alpine-release 3.20.2-r0 apk
|
||||
aom-libs 3.9.1-r0 apk
|
||||
apache2-utils 2.4.62-r0 apk
|
||||
apk-tools 2.14.4-r0 apk
|
||||
@@ -14,15 +14,15 @@ argon2-libs 20190702-r5 apk
|
||||
attrs 24.2.0 python
|
||||
autocommand 2.2.2 python
|
||||
azure-common 1.1.28 python
|
||||
azure-core 1.31.0 python
|
||||
azure-core 1.30.2 python
|
||||
azure-identity 1.17.1 python
|
||||
azure-mgmt-core 1.4.0 python
|
||||
azure-mgmt-dns 8.1.0 python
|
||||
backports-tarfile 1.2.0 python
|
||||
bash 5.2.26-r0 apk
|
||||
beautifulsoup4 4.12.3 python
|
||||
boto3 1.35.19 python
|
||||
botocore 1.35.19 python
|
||||
boto3 1.35.14 python
|
||||
botocore 1.35.14 python
|
||||
brotli-libs 1.1.0-r2 apk
|
||||
bs4 0.0.2 python
|
||||
busybox 1.36.1-r29 apk
|
||||
@@ -98,7 +98,7 @@ domeneshop 0.4.4 python
|
||||
fail2ban 1.1.0 python
|
||||
fail2ban 1.1.0-r0 apk
|
||||
fail2ban-pyc 1.1.0-r0 apk
|
||||
filelock 3.16.0 python
|
||||
filelock 3.15.4 python
|
||||
findutils 4.9.0-r5 apk
|
||||
fontconfig 2.15.0-r1 apk
|
||||
freetype 2.13.2-r0 apk
|
||||
@@ -116,7 +116,7 @@ gnupg-utils 2.4.5-r0 apk
|
||||
gnupg-wks-client 2.4.5-r0 apk
|
||||
gnutls 3.8.5-r0 apk
|
||||
google-api-core 2.19.2 python
|
||||
google-api-python-client 2.145.0 python
|
||||
google-api-python-client 2.144.0 python
|
||||
google-auth 2.34.0 python
|
||||
google-auth-httplib2 0.2.0 python
|
||||
googleapis-common-protos 1.65.0 python
|
||||
@@ -128,7 +128,7 @@ gpgv 2.4.5-r0 apk
|
||||
httplib2 0.22.0 python
|
||||
icu-data-en 74.2-r0 apk
|
||||
icu-libs 74.2-r0 apk
|
||||
idna 3.9 python
|
||||
idna 3.8 python
|
||||
importlib-metadata 8.0.0 python
|
||||
importlib-resources 6.4.0 python
|
||||
inflect 7.3.1 python
|
||||
@@ -173,9 +173,9 @@ libmcrypt 2.5.8-r10 apk
|
||||
libmd 1.1.0-r0 apk
|
||||
libmemcached-libs 1.1.4-r1 apk
|
||||
libmnl 1.0.5-r2 apk
|
||||
libncursesw 6.4_p20240420-r1 apk
|
||||
libncursesw 6.4_p20240420-r0 apk
|
||||
libnftnl 1.2.6-r0 apk
|
||||
libpanelw 6.4_p20240420-r1 apk
|
||||
libpanelw 6.4_p20240420-r0 apk
|
||||
libpng 1.6.43-r0 apk
|
||||
libpq 16.3-r0 apk
|
||||
libproc2 4.0.4-r0 apk
|
||||
@@ -217,7 +217,7 @@ musl 1.2.5-r0 apk
|
||||
musl-utils 1.2.5-r0 apk
|
||||
my-test-package 1.0 python
|
||||
nano 8.0-r0 apk
|
||||
ncurses-terminfo-base 6.4_p20240420-r1 apk
|
||||
ncurses-terminfo-base 6.4_p20240420-r0 apk
|
||||
netcat-openbsd 1.226-r0 apk
|
||||
nettle 3.9.1-r0 apk
|
||||
nghttp2-libs 1.62.1-r0 apk
|
||||
@@ -308,11 +308,11 @@ popt 1.19-r3 apk
|
||||
portalocker 2.10.1 python
|
||||
procps-ng 4.0.4-r0 apk
|
||||
proto-plus 1.24.0 python
|
||||
protobuf 5.28.1 python
|
||||
protobuf 5.28.0 python
|
||||
pyacmedns 0.4 python
|
||||
pyasn1 0.6.1 python
|
||||
pyasn1-modules 0.4.1 python
|
||||
pyc 3.12.6-r0 apk
|
||||
pyasn1 0.6.0 python
|
||||
pyasn1-modules 0.4.0 python
|
||||
pyc 3.12.3-r2 apk
|
||||
pycparser 2.22 python
|
||||
pyjwt 2.9.0 python
|
||||
pynamecheap 0.0.3 python
|
||||
@@ -323,10 +323,10 @@ pyrfc3339 1.1 python
|
||||
python-dateutil 2.9.0.post0 python
|
||||
python-digitalocean 1.17.0 python
|
||||
python-transip 0.6.0 python
|
||||
python3 3.12.6-r0 apk
|
||||
python3-pyc 3.12.6-r0 apk
|
||||
python3-pycache-pyc0 3.12.6-r0 apk
|
||||
pytz 2024.2 python
|
||||
python3 3.12.3-r2 apk
|
||||
python3-pyc 3.12.3-r2 apk
|
||||
python3-pycache-pyc0 3.12.3-r2 apk
|
||||
pytz 2024.1 python
|
||||
pyyaml 6.0.2 python
|
||||
readline 8.2.10-r0 apk
|
||||
requests 2.32.3 python
|
||||
@@ -347,10 +347,10 @@ tldextract 5.1.2 python
|
||||
tomli 2.0.1 python
|
||||
typeguard 4.3.0 python
|
||||
typing-extensions 4.12.2 python (+1 duplicate)
|
||||
tzdata 2024b-r0 apk
|
||||
tzdata 2024a-r1 apk
|
||||
unixodbc 2.3.12-r0 apk
|
||||
uritemplate 4.1.1 python
|
||||
urllib3 2.2.3 python
|
||||
urllib3 2.2.2 python
|
||||
utmps-libs 0.1.2.2-r1 apk
|
||||
wheel 0.43.0 python
|
||||
wheel 0.44.0 python
|
||||
|
||||
0
root/app/le-renew.sh
Normal file → Executable file
0
root/app/le-renew.sh
Normal file → Executable file
2
root/defaults/etc/letsencrypt/renewal-hooks/deploy/10-default
Normal file → Executable file
2
root/defaults/etc/letsencrypt/renewal-hooks/deploy/10-default
Normal file → Executable file
@@ -1,7 +1,9 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
# shellcheck shell=bash
|
||||
# Notice: This file will be overwritten when updated by lsio. Add your custom scripts into a new file in this folder.
|
||||
|
||||
cd /config/keys/letsencrypt || exit 1
|
||||
echo "**** Generating pfx and fullchain bundle certs ****"
|
||||
openssl pkcs12 -export -out privkey.pfx -inkey privkey.pem -in cert.pem -certfile chain.pem -passout pass:
|
||||
sleep 1
|
||||
cat {privkey,fullchain}.pem >priv-fullchain-bundle.pem
|
||||
|
||||
3
root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx
Normal file → Executable file
3
root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx
Normal file → Executable file
@@ -1,15 +1,18 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
# shellcheck shell=bash
|
||||
# Notice: This file will be overwritten when updated by lsio. Add your custom scripts into a new file in this folder.
|
||||
|
||||
# shellcheck source=/dev/null
|
||||
. /config/.donoteditthisfile.conf
|
||||
|
||||
if [[ ! "${ORIGVALIDATION}" = "dns" ]] && [[ ! "${ORIGVALIDATION}" = "duckdns" ]]; then
|
||||
if pgrep -f "s6-supervise svc-nginx" >/dev/null; then
|
||||
echo "**** Starting Nginx ****"
|
||||
s6-svc -u /run/service/svc-nginx
|
||||
fi
|
||||
else
|
||||
if pgrep -f "nginx:" >/dev/null; then
|
||||
echo "**** Reloading Nginx to load the new cert ****"
|
||||
s6-svc -h /run/service/svc-nginx
|
||||
fi
|
||||
fi
|
||||
|
||||
2
root/defaults/etc/letsencrypt/renewal-hooks/pre/10-nginx
Normal file → Executable file
2
root/defaults/etc/letsencrypt/renewal-hooks/pre/10-nginx
Normal file → Executable file
@@ -1,11 +1,13 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
# shellcheck shell=bash
|
||||
# Notice: This file will be overwritten when updated by lsio. Add your custom scripts into a new file in this folder.
|
||||
|
||||
# shellcheck source=/dev/null
|
||||
. /config/.donoteditthisfile.conf
|
||||
|
||||
if [[ ! "${ORIGVALIDATION}" = "dns" ]] && [[ ! "${ORIGVALIDATION}" = "duckdns" ]]; then
|
||||
if pgrep -f "nginx:" >/dev/null; then
|
||||
echo "**** Stopping Nginx in preparation of cert generation/renewal ****"
|
||||
s6-svc -d /run/service/svc-nginx
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -68,14 +68,9 @@ lsiown -R abc:abc /config/dns-conf
|
||||
|
||||
# copy default renewal hooks
|
||||
chmod -R +x /defaults/etc/letsencrypt/renewal-hooks
|
||||
cp -nR /defaults/etc/letsencrypt/renewal-hooks/* /config/etc/letsencrypt/renewal-hooks/ 2> >(grep -v 'cp: not replacing')
|
||||
cp -Rf /defaults/etc/letsencrypt/renewal-hooks/* /config/etc/letsencrypt/renewal-hooks/ 2> >(grep -v 'cp: not replacing')
|
||||
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
|
||||
mv /config/donoteditthisfile.conf /config/.donoteditthisfile.conf
|
||||
|
||||
Reference in New Issue
Block a user