mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-03 00:43:34 +09:00
Compare commits
10 Commits
2.7.4-ls25
...
2.7.4-ls26
| Author | SHA1 | Date | |
|---|---|---|---|
|
1abab5cb6d | ||
|
|
0061faef15 | ||
|
6e64bcbd7e | ||
|
|
b9dd1b7c5a | ||
|
|
e9bceab763 | ||
|
|
eba3c341fa | ||
|
|
5fc5825afd | ||
|
|
de18e4ef24 | ||
|
|
fbe212b67c | ||
|
|
e3560414dc |
@@ -401,6 +401,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **30.11.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404.
|
||||
* **23.11.23:** - Run certbot as root to allow fix http validation.
|
||||
* **01.10.23:** - Fix "unrecognized arguments" issue in DirectAdmin DNS plugin.
|
||||
* **28.08.23:** - Add Namecheap DNS plugin.
|
||||
* **12.08.23:** - Add FreeDNS plugin. Detect certbot DNS authenticators using CLI.
|
||||
|
||||
@@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python
|
||||
azure-mgmt-dns 8.1.0 python
|
||||
bash 5.2.15-r5 apk
|
||||
beautifulsoup4 4.12.2 python
|
||||
boto3 1.29.6 python
|
||||
botocore 1.32.6 python
|
||||
boto3 1.33.5 python
|
||||
botocore 1.33.5 python
|
||||
brotli-libs 1.0.9-r14 apk
|
||||
bs4 0.0.1 python
|
||||
busybox 1.36.1-r5 apk
|
||||
@@ -80,10 +80,10 @@ certbot-plugin-gandi 1.5.0 python
|
||||
certifi 2023.11.17 python
|
||||
cffi 1.16.0 python
|
||||
charset-normalizer 3.3.2 python
|
||||
cloudflare 2.12.4 python
|
||||
cloudflare 2.14.2 python
|
||||
configobj 5.0.8 python
|
||||
coreutils 9.3-r1 apk
|
||||
cryptography 41.0.5 python
|
||||
cryptography 41.0.7 python
|
||||
curl 8.4.0-r0 apk
|
||||
dataclasses-json 0.5.14 python
|
||||
distro 1.8.0 python
|
||||
@@ -110,8 +110,8 @@ gnupg-utils 2.4.3-r0 apk
|
||||
gnupg-wks-client 2.4.3-r0 apk
|
||||
gnutls 3.8.0-r2 apk
|
||||
google-api-core 2.14.0 python
|
||||
google-api-python-client 2.108.0 python
|
||||
google-auth 2.23.4 python
|
||||
google-api-python-client 2.109.0 python
|
||||
google-auth 2.24.0 python
|
||||
google-auth-httplib2 0.1.1 python
|
||||
googleapis-common-protos 1.61.0 python
|
||||
gpg 2.4.3-r0 apk
|
||||
@@ -122,7 +122,7 @@ gpgv 2.4.3-r0 apk
|
||||
httplib2 0.22.0 python
|
||||
icu-data-en 73.2-r2 apk
|
||||
icu-libs 73.2-r2 apk
|
||||
idna 3.5 python
|
||||
idna 3.6 python
|
||||
importlib-metadata 6.8.0 python
|
||||
ip6tables 1.8.9-r2 apk
|
||||
iptables 1.8.9-r2 apk
|
||||
@@ -233,31 +233,31 @@ packaging 23.2 python
|
||||
parsedatetime 2.6 python
|
||||
pcre 8.45-r3 apk
|
||||
pcre2 10.42-r1 apk
|
||||
perl 5.36.1-r2 apk
|
||||
perl 5.36.2-r0 apk
|
||||
perl-error 0.17029-r1 apk
|
||||
perl-git 2.40.1-r0 apk
|
||||
php82 8.2.12-r0 apk
|
||||
php82 8.2.13-r0 apk
|
||||
php82-bcmath 8.2.13-r0 apk
|
||||
php82-bz2 8.2.13-r0 apk
|
||||
php82-common 8.2.12-r0 apk
|
||||
php82-ctype 8.2.12-r0 apk
|
||||
php82-curl 8.2.12-r0 apk
|
||||
php82-common 8.2.13-r0 apk
|
||||
php82-ctype 8.2.13-r0 apk
|
||||
php82-curl 8.2.13-r0 apk
|
||||
php82-dom 8.2.13-r0 apk
|
||||
php82-exif 8.2.13-r0 apk
|
||||
php82-fileinfo 8.2.12-r0 apk
|
||||
php82-fpm 8.2.12-r0 apk
|
||||
php82-fileinfo 8.2.13-r0 apk
|
||||
php82-fpm 8.2.13-r0 apk
|
||||
php82-ftp 8.2.13-r0 apk
|
||||
php82-gd 8.2.13-r0 apk
|
||||
php82-gmp 8.2.13-r0 apk
|
||||
php82-iconv 8.2.12-r0 apk
|
||||
php82-iconv 8.2.13-r0 apk
|
||||
php82-imap 8.2.13-r0 apk
|
||||
php82-intl 8.2.13-r0 apk
|
||||
php82-ldap 8.2.13-r0 apk
|
||||
php82-mbstring 8.2.12-r0 apk
|
||||
php82-mbstring 8.2.13-r0 apk
|
||||
php82-mysqli 8.2.13-r0 apk
|
||||
php82-mysqlnd 8.2.13-r0 apk
|
||||
php82-opcache 8.2.13-r0 apk
|
||||
php82-openssl 8.2.12-r0 apk
|
||||
php82-openssl 8.2.13-r0 apk
|
||||
php82-pdo 8.2.13-r0 apk
|
||||
php82-pdo_mysql 8.2.13-r0 apk
|
||||
php82-pdo_odbc 8.2.13-r0 apk
|
||||
@@ -271,20 +271,20 @@ php82-pecl-memcached 3.2.0-r1 apk
|
||||
php82-pecl-msgpack 2.2.0-r0 apk
|
||||
php82-pecl-redis 6.0.2-r0 apk
|
||||
php82-pgsql 8.2.13-r0 apk
|
||||
php82-phar 8.2.12-r0 apk
|
||||
php82-phar 8.2.13-r0 apk
|
||||
php82-posix 8.2.13-r0 apk
|
||||
php82-session 8.2.12-r0 apk
|
||||
php82-simplexml 8.2.12-r0 apk
|
||||
php82-session 8.2.13-r0 apk
|
||||
php82-simplexml 8.2.13-r0 apk
|
||||
php82-soap 8.2.13-r0 apk
|
||||
php82-sockets 8.2.13-r0 apk
|
||||
php82-sodium 8.2.13-r0 apk
|
||||
php82-sqlite3 8.2.13-r0 apk
|
||||
php82-tokenizer 8.2.13-r0 apk
|
||||
php82-xml 8.2.12-r0 apk
|
||||
php82-xml 8.2.13-r0 apk
|
||||
php82-xmlreader 8.2.13-r0 apk
|
||||
php82-xmlwriter 8.2.12-r0 apk
|
||||
php82-xmlwriter 8.2.13-r0 apk
|
||||
php82-xsl 8.2.13-r0 apk
|
||||
php82-zip 8.2.12-r0 apk
|
||||
php82-zip 8.2.13-r0 apk
|
||||
pinentry 1.2.1-r1 apk
|
||||
pip 23.3.1 python
|
||||
pkb-client 1.2 python
|
||||
@@ -313,7 +313,7 @@ requests 2.31.0 python
|
||||
requests-file 1.5.1 python
|
||||
requests-mock 1.11.0 python
|
||||
rsa 4.9 python
|
||||
s3transfer 0.7.0 python
|
||||
s3transfer 0.8.2 python
|
||||
scanelf 1.3.7-r1 apk
|
||||
setuptools 65.5.0 python
|
||||
shadow 4.13-r4 apk
|
||||
@@ -331,7 +331,7 @@ unixodbc 2.3.11-r2 apk
|
||||
uritemplate 4.1.1 python
|
||||
urllib3 1.26.18 python
|
||||
utmps-libs 0.1.2.1-r1 apk
|
||||
wheel 0.41.3 python
|
||||
wheel 0.42.0 python
|
||||
whois 5.5.17-r0 apk
|
||||
xz-libs 5.4.3-r0 apk
|
||||
zipp 3.17.0 python
|
||||
|
||||
@@ -153,6 +153,8 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "30.11.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404." }
|
||||
- { date: "23.11.23:", desc: "Run certbot as root to allow fix http validation." }
|
||||
- { date: "01.10.23:", desc: "Fix \"unrecognized arguments\" issue in DirectAdmin DNS plugin." }
|
||||
- { date: "28.08.23:", desc: "Add Namecheap DNS plugin." }
|
||||
- { date: "12.08.23:", desc: "Add FreeDNS plugin. Detect certbot DNS authenticators using CLI." }
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
## Version 2023/06/05 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||
## Version 2023/11/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||
|
||||
# redirect all traffic to https
|
||||
server {
|
||||
@@ -48,7 +48,7 @@ server {
|
||||
# enable for Authentik (requires authentik-server.conf in the server block)
|
||||
#include /config/nginx/authentik-location.conf;
|
||||
|
||||
try_files $uri $uri/ /index.html /index.php$is_args$args =404;
|
||||
try_files $uri $uri/ /index.html /index.php$is_args$args;
|
||||
}
|
||||
|
||||
location ~ ^(.+\.php)(.*)$ {
|
||||
@@ -65,6 +65,7 @@ server {
|
||||
# enable for Authentik (requires authentik-server.conf in the server block)
|
||||
#include /config/nginx/authentik-location.conf;
|
||||
|
||||
try_files $fastcgi_script_name =404;
|
||||
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
||||
fastcgi_pass 127.0.0.1:9000;
|
||||
fastcgi_index index.php;
|
||||
|
||||
@@ -199,9 +199,9 @@ if [[ ! "${URL}" = "${ORIGURL}" ]] ||
|
||||
REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory")
|
||||
fi
|
||||
if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
|
||||
s6-setuidgid abc 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 --server "${REV_ACMESERVER[@]}" || true
|
||||
else
|
||||
s6-setuidgid abc certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
|
||||
certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
|
||||
fi
|
||||
rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal}
|
||||
fi
|
||||
@@ -214,9 +214,9 @@ if [[ -f "/config/keys/letsencrypt/chain.pem" ]] && { [[ "${CERTPROVIDER}" == "l
|
||||
echo "The cert seems to be using the old LE root cert, which is no longer valid. Deleting and revoking."
|
||||
REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory")
|
||||
if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
|
||||
s6-setuidgid abc 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 --server "${REV_ACMESERVER[@]}" || true
|
||||
else
|
||||
s6-setuidgid abc certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
|
||||
certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
|
||||
fi
|
||||
rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal}
|
||||
fi
|
||||
@@ -349,7 +349,7 @@ if [[ ! -f "/config/keys/letsencrypt/fullchain.pem" ]]; then
|
||||
set_ini_value "eab-hmac-key" "${ZEROSSL_EAB_HMAC_KEY}" /config/etc/letsencrypt/cli.ini
|
||||
fi
|
||||
echo "Generating new certificate"
|
||||
s6-setuidgid abc certbot certonly --non-interactive --renew-by-default
|
||||
certbot certonly --non-interactive --renew-by-default
|
||||
if [[ ! -d /config/keys/letsencrypt ]]; then
|
||||
if [[ "${VALIDATION}" = "dns" ]]; then
|
||||
echo "ERROR: Cert does not exist! Please see the validation error above. Make sure you entered correct credentials into the ${DNSCREDENTIALFILE} file."
|
||||
|
||||
Reference in New Issue
Block a user