mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-03 17:03:35 +09:00
Compare commits
9 Commits
2.4.0-ls18
...
2.4.0-ls19
| Author | SHA1 | Date | |
|---|---|---|---|
|
70c66c5495 | ||
|
430308342f | ||
|
|
97222fbb25 | ||
|
|
b00bf6caf2 | ||
|
|
7dac282621 | ||
|
|
0c1936f8ec | ||
|
|
e5bb6e4a9d | ||
|
|
951fafd0b9 | ||
|
|
4899670c70 |
@@ -336,6 +336,8 @@ 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.
|
||||
* **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.
|
||||
|
||||
@@ -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.88 python
|
||||
botocore 1.29.88 python
|
||||
beautifulsoup4 4.12.0 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
|
||||
@@ -46,12 +46,12 @@ 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
|
||||
certbot-dns-google 2.4.0 python
|
||||
certbot-dns-google-domains 0.1.6 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
|
||||
@@ -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
|
||||
@@ -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.9.0 python
|
||||
filelock 3.10.4 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.80.0 python
|
||||
google-auth 2.16.2 python
|
||||
google-api-python-client 2.82.0 python
|
||||
google-auth 2.16.3 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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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-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-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
|
||||
php-cli 8.1.17 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-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-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-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-xmlwriter 8.1.16-r0 apk
|
||||
php81-xsl 8.1.16-r0 apk
|
||||
php81-zip 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.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-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
|
||||
pip 23.0.1 python
|
||||
pkb-client 1.2 python
|
||||
@@ -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
|
||||
@@ -321,20 +321,20 @@ 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
|
||||
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
|
||||
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
|
||||
|
||||
@@ -154,6 +154,8 @@ 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." }
|
||||
- { 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." }
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -140,6 +141,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}" ]] ||
|
||||
|
||||
Reference in New Issue
Block a user