mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-13 13:45:15 +09:00
Compare commits
8 Commits
2.5.0-ls19
...
2.5.0-ls20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2f740e60a8 | ||
|
|
cfb3fae7cf | ||
|
|
9357986f27 | ||
|
|
eb0bcf14dd | ||
|
|
97e2720b9c | ||
|
|
7550f946ff | ||
|
|
7a831681c5 | ||
|
|
43a7239fbf |
@@ -336,6 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **13.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik.
|
||||||
* **25.03.23:** - Fix renewal post hook.
|
* **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`.
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ apk-tools 2.12.10-r1 apk
|
|||||||
apr 1.7.2-r0 apk
|
apr 1.7.2-r0 apk
|
||||||
apr-util 1.6.3-r0 apk
|
apr-util 1.6.3-r0 apk
|
||||||
argon2-libs 20190702-r2 apk
|
argon2-libs 20190702-r2 apk
|
||||||
attrs 22.2.0 python
|
attrs 23.1.0 python
|
||||||
azure-common 1.1.28 python
|
azure-common 1.1.28 python
|
||||||
azure-core 1.26.4 python
|
azure-core 1.26.4 python
|
||||||
azure-identity 1.12.0 python
|
azure-identity 1.12.0 python
|
||||||
@@ -21,8 +21,8 @@ azure-mgmt-core 1.4.0 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.2 python
|
beautifulsoup4 4.12.2 python
|
||||||
boto3 1.26.114 python
|
boto3 1.26.118 python
|
||||||
botocore 1.29.114 python
|
botocore 1.29.118 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
|
||||||
@@ -79,7 +79,7 @@ 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 40.0.2 python
|
cryptography 40.0.2 python
|
||||||
curl 7.88.1-r1 apk
|
curl 8.0.1-r0 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.11.0 python
|
filelock 3.12.0 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
|
||||||
@@ -103,7 +103,7 @@ gnupg-utils 2.2.40-r0 apk
|
|||||||
gnupg-wks-client 2.2.40-r0 apk
|
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.85.0 python
|
google-api-python-client 2.86.0 python
|
||||||
google-auth 2.17.3 python
|
google-auth 2.17.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
|
||||||
@@ -116,7 +116,7 @@ httplib2 0.22.0 python
|
|||||||
icu-data-en 72.1-r1 apk
|
icu-data-en 72.1-r1 apk
|
||||||
icu-libs 72.1-r1 apk
|
icu-libs 72.1-r1 apk
|
||||||
idna 3.4 python
|
idna 3.4 python
|
||||||
importlib-metadata 6.3.0 python
|
importlib-metadata 6.5.1 python
|
||||||
ip6tables 1.8.8-r2 apk
|
ip6tables 1.8.8-r2 apk
|
||||||
iptables 1.8.8-r2 apk
|
iptables 1.8.8-r2 apk
|
||||||
isodate 0.6.1 python
|
isodate 0.6.1 python
|
||||||
@@ -132,7 +132,7 @@ libavif 0.11.1-r0 apk
|
|||||||
libbsd 0.11.7-r0 apk
|
libbsd 0.11.7-r0 apk
|
||||||
libbz2 1.0.8-r4 apk
|
libbz2 1.0.8-r4 apk
|
||||||
libc-utils 0.7.2-r3 apk
|
libc-utils 0.7.2-r3 apk
|
||||||
libcrypto3 3.0.8-r3 apk
|
libcrypto3 3.0.8-r4 apk
|
||||||
libcurl 8.0.1-r0 apk
|
libcurl 8.0.1-r0 apk
|
||||||
libdav1d 1.0.0-r2 apk
|
libdav1d 1.0.0-r2 apk
|
||||||
libedit 20221030.3.1-r0 apk
|
libedit 20221030.3.1-r0 apk
|
||||||
@@ -162,7 +162,7 @@ libsasl 2.1.28-r3 apk
|
|||||||
libseccomp 2.5.4-r0 apk
|
libseccomp 2.5.4-r0 apk
|
||||||
libsm 1.2.3-r1 apk
|
libsm 1.2.3-r1 apk
|
||||||
libsodium 1.0.18-r2 apk
|
libsodium 1.0.18-r2 apk
|
||||||
libssl3 3.0.8-r3 apk
|
libssl3 3.0.8-r4 apk
|
||||||
libstdc++ 12.2.1_git20220924-r4 apk
|
libstdc++ 12.2.1_git20220924-r4 apk
|
||||||
libtasn1 4.19.0-r0 apk
|
libtasn1 4.19.0-r0 apk
|
||||||
libunistring 1.1-r0 apk
|
libunistring 1.1-r0 apk
|
||||||
@@ -187,9 +187,9 @@ marshmallow 3.19.0 python
|
|||||||
marshmallow-enum 1.5.1 python
|
marshmallow-enum 1.5.1 python
|
||||||
memcached 1.6.17 binary
|
memcached 1.6.17 binary
|
||||||
memcached 1.6.17-r0 apk
|
memcached 1.6.17-r0 apk
|
||||||
mock 5.0.1 python
|
mock 5.0.2 python
|
||||||
mpdecimal 2.5.1-r1 apk
|
mpdecimal 2.5.1-r1 apk
|
||||||
msal 1.21.0 python
|
msal 1.22.0 python
|
||||||
msal-extensions 1.0.0 python
|
msal-extensions 1.0.0 python
|
||||||
msrest 0.7.1 python
|
msrest 0.7.1 python
|
||||||
musl 1.2.3-r4 apk
|
musl 1.2.3-r4 apk
|
||||||
@@ -224,17 +224,17 @@ 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-r3 apk
|
openssl 3.0.8-r4 apk
|
||||||
p11-kit 0.24.1-r1 apk
|
p11-kit 0.24.1-r1 apk
|
||||||
packaging 23.1 python
|
packaging 23.1 python
|
||||||
parsedatetime 2.6 python
|
parsedatetime 2.6 python
|
||||||
pcre 8.45-r2 apk
|
pcre 8.45-r2 apk
|
||||||
pcre2 10.42-r0 apk
|
pcre2 10.42-r0 apk
|
||||||
perl 5.36.0-r0 apk
|
perl 5.36.0-r1 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.18 binary
|
php-cli 8.1.18 binary
|
||||||
php-fpm 8.1.17 binary
|
php-fpm 8.1.18 binary
|
||||||
php81 8.1.18-r0 apk
|
php81 8.1.18-r0 apk
|
||||||
php81-bcmath 8.1.18-r0 apk
|
php81-bcmath 8.1.18-r0 apk
|
||||||
php81-bz2 8.1.18-r0 apk
|
php81-bz2 8.1.18-r0 apk
|
||||||
@@ -243,8 +243,8 @@ php81-ctype 8.1.18-r0 apk
|
|||||||
php81-curl 8.1.18-r0 apk
|
php81-curl 8.1.18-r0 apk
|
||||||
php81-dom 8.1.18-r0 apk
|
php81-dom 8.1.18-r0 apk
|
||||||
php81-exif 8.1.18-r0 apk
|
php81-exif 8.1.18-r0 apk
|
||||||
php81-fileinfo 8.1.17-r0 apk
|
php81-fileinfo 8.1.18-r0 apk
|
||||||
php81-fpm 8.1.17-r0 apk
|
php81-fpm 8.1.18-r0 apk
|
||||||
php81-ftp 8.1.18-r0 apk
|
php81-ftp 8.1.18-r0 apk
|
||||||
php81-gd 8.1.18-r0 apk
|
php81-gd 8.1.18-r0 apk
|
||||||
php81-gmp 8.1.18-r0 apk
|
php81-gmp 8.1.18-r0 apk
|
||||||
@@ -274,7 +274,7 @@ php81-pgsql 8.1.18-r0 apk
|
|||||||
php81-phar 8.1.18-r0 apk
|
php81-phar 8.1.18-r0 apk
|
||||||
php81-posix 8.1.18-r0 apk
|
php81-posix 8.1.18-r0 apk
|
||||||
php81-session 8.1.18-r0 apk
|
php81-session 8.1.18-r0 apk
|
||||||
php81-simplexml 8.1.17-r0 apk
|
php81-simplexml 8.1.18-r0 apk
|
||||||
php81-soap 8.1.18-r0 apk
|
php81-soap 8.1.18-r0 apk
|
||||||
php81-sockets 8.1.18-r0 apk
|
php81-sockets 8.1.18-r0 apk
|
||||||
php81-sodium 8.1.18-r0 apk
|
php81-sodium 8.1.18-r0 apk
|
||||||
@@ -282,22 +282,22 @@ php81-sqlite3 8.1.18-r0 apk
|
|||||||
php81-tokenizer 8.1.18-r0 apk
|
php81-tokenizer 8.1.18-r0 apk
|
||||||
php81-xml 8.1.18-r0 apk
|
php81-xml 8.1.18-r0 apk
|
||||||
php81-xmlreader 8.1.18-r0 apk
|
php81-xmlreader 8.1.18-r0 apk
|
||||||
php81-xmlwriter 8.1.17-r0 apk
|
php81-xmlwriter 8.1.18-r0 apk
|
||||||
php81-xsl 8.1.18-r0 apk
|
php81-xsl 8.1.18-r0 apk
|
||||||
php81-zip 8.1.18-r0 apk
|
php81-zip 8.1.18-r0 apk
|
||||||
pinentry 1.2.1-r0 apk
|
pinentry 1.2.1-r0 apk
|
||||||
pip 23.0.1 python
|
pip 23.1 python
|
||||||
pkb-client 1.2 python
|
pkb-client 1.2 python
|
||||||
popt 1.19-r0 apk
|
popt 1.19-r0 apk
|
||||||
portalocker 2.7.0 python
|
portalocker 2.7.0 python
|
||||||
procps 3.3.17-r2 apk
|
procps 3.3.17-r2 apk
|
||||||
protobuf 4.22.3 python
|
protobuf 4.22.3 python
|
||||||
publicsuffixlist 0.9.3 python
|
publicsuffixlist 0.9.4 python
|
||||||
pyOpenSSL 23.1.1 python
|
pyOpenSSL 23.1.1 python
|
||||||
pyRFC3339 1.1 python
|
pyRFC3339 1.1 python
|
||||||
pyacmedns 0.4 python
|
pyacmedns 0.4 python
|
||||||
pyasn1 0.4.8 python
|
pyasn1 0.5.0 python
|
||||||
pyasn1-modules 0.2.8 python
|
pyasn1-modules 0.3.0 python
|
||||||
pycparser 2.21 python
|
pycparser 2.21 python
|
||||||
pyparsing 3.0.9 python
|
pyparsing 3.0.9 python
|
||||||
python 3.10.11 binary
|
python 3.10.11 binary
|
||||||
@@ -318,7 +318,7 @@ setuptools 65.5.0 python
|
|||||||
shadow 4.13-r0 apk
|
shadow 4.13-r0 apk
|
||||||
six 1.16.0 python
|
six 1.16.0 python
|
||||||
skalibs 2.12.0.1-r0 apk
|
skalibs 2.12.0.1-r0 apk
|
||||||
soupsieve 2.4 python
|
soupsieve 2.4.1 python
|
||||||
sqlite-libs 3.40.1-r0 apk
|
sqlite-libs 3.40.1-r0 apk
|
||||||
ssl_client 1.35.0-r29 apk
|
ssl_client 1.35.0-r29 apk
|
||||||
tiff 4.4.0-r3 apk
|
tiff 4.4.0-r3 apk
|
||||||
|
|||||||
@@ -154,6 +154,7 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "13.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik." }
|
||||||
- { date: "25.03.23:", desc: "Fix renewal post hook." }
|
- { 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`." }
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-location.conf.sample
|
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-location.conf.sample
|
||||||
# Make sure that your authelia container is in the same user defined bridge network and is named authelia
|
# Make sure that your authelia container is in the same user defined bridge network and is named authelia
|
||||||
# Rename /config/nginx/proxy-confs/authelia.subdomain.conf.sample to /config/nginx/proxy-confs/authelia.subdomain.conf
|
# Rename /config/nginx/proxy-confs/authelia.subdomain.conf.sample to /config/nginx/proxy-confs/authelia.subdomain.conf
|
||||||
# Make sure that the authelia configuration.yml has 'path: "authelia"' defined
|
# Make sure that the authelia configuration.yml has 'path: "authelia"' defined
|
||||||
@@ -9,20 +9,16 @@ auth_request /authelia/api/verify;
|
|||||||
error_page 401 = @authelia_proxy_signin;
|
error_page 401 = @authelia_proxy_signin;
|
||||||
|
|
||||||
## Translate response headers from Authelia into variables
|
## Translate response headers from Authelia into variables
|
||||||
auth_request_set $user $upstream_http_remote_user;
|
auth_request_set $email $upstream_http_remote_email;
|
||||||
auth_request_set $groups $upstream_http_remote_groups;
|
auth_request_set $groups $upstream_http_remote_groups;
|
||||||
auth_request_set $name $upstream_http_remote_name;
|
auth_request_set $name $upstream_http_remote_name;
|
||||||
auth_request_set $email $upstream_http_remote_email;
|
auth_request_set $user $upstream_http_remote_user;
|
||||||
auth_request_set $authorization $upstream_http_authorization;
|
|
||||||
auth_request_set $proxy_authorization $upstream_http_proxy_authorization;
|
|
||||||
|
|
||||||
## Inject the response header variables into the request made to the actual upstream
|
## Inject the response header variables into the request made to the actual upstream
|
||||||
proxy_set_header Remote-User $user;
|
proxy_set_header Remote-Email $email;
|
||||||
proxy_set_header Remote-Groups $groups;
|
proxy_set_header Remote-Groups $groups;
|
||||||
proxy_set_header Remote-Name $name;
|
proxy_set_header Remote-Name $name;
|
||||||
proxy_set_header Remote-Email $email;
|
proxy_set_header Remote-User $user;
|
||||||
proxy_set_header Authorization $authorization;
|
|
||||||
proxy_set_header Proxy-Authorization $proxy_authorization;
|
|
||||||
|
|
||||||
## Include the Set-Cookie header if present.
|
## Include the Set-Cookie header if present.
|
||||||
auth_request_set $set_cookie $upstream_http_set_cookie;
|
auth_request_set $set_cookie $upstream_http_set_cookie;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-location.conf.sample
|
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-location.conf.sample
|
||||||
# Make sure that your authentik container is in the same user defined bridge network and is named authentik-server
|
# Make sure that your authentik container is in the same user defined bridge network and is named authentik-server
|
||||||
# Rename /config/nginx/proxy-confs/authentik.subdomain.conf.sample to /config/nginx/proxy-confs/authentik.subdomain.conf
|
# Rename /config/nginx/proxy-confs/authentik.subdomain.conf.sample to /config/nginx/proxy-confs/authentik.subdomain.conf
|
||||||
|
|
||||||
@@ -8,18 +8,18 @@ auth_request /outpost.goauthentik.io/auth/nginx;
|
|||||||
error_page 401 = @goauthentik_proxy_signin;
|
error_page 401 = @goauthentik_proxy_signin;
|
||||||
|
|
||||||
## Translate response headers from Authentik into variables
|
## Translate response headers from Authentik into variables
|
||||||
auth_request_set $authentik_username $upstream_http_x_authentik_username;
|
|
||||||
auth_request_set $authentik_groups $upstream_http_x_authentik_groups;
|
|
||||||
auth_request_set $authentik_email $upstream_http_x_authentik_email;
|
auth_request_set $authentik_email $upstream_http_x_authentik_email;
|
||||||
|
auth_request_set $authentik_groups $upstream_http_x_authentik_groups;
|
||||||
auth_request_set $authentik_name $upstream_http_x_authentik_name;
|
auth_request_set $authentik_name $upstream_http_x_authentik_name;
|
||||||
auth_request_set $authentik_uid $upstream_http_x_authentik_uid;
|
auth_request_set $authentik_uid $upstream_http_x_authentik_uid;
|
||||||
|
auth_request_set $authentik_username $upstream_http_x_authentik_username;
|
||||||
|
|
||||||
## Inject the response header variables into the request made to the actual upstream
|
## Inject the response header variables into the request made to the actual upstream
|
||||||
proxy_set_header X-authentik-username $authentik_username;
|
|
||||||
proxy_set_header X-authentik-groups $authentik_groups;
|
|
||||||
proxy_set_header X-authentik-email $authentik_email;
|
proxy_set_header X-authentik-email $authentik_email;
|
||||||
|
proxy_set_header X-authentik-groups $authentik_groups;
|
||||||
proxy_set_header X-authentik-name $authentik_name;
|
proxy_set_header X-authentik-name $authentik_name;
|
||||||
proxy_set_header X-authentik-uid $authentik_uid;
|
proxy_set_header X-authentik-uid $authentik_uid;
|
||||||
|
proxy_set_header X-authentik-username $authentik_username;
|
||||||
|
|
||||||
## Include the Set-Cookie header if present.
|
## Include the Set-Cookie header if present.
|
||||||
auth_request_set $set_cookie $upstream_http_set_cookie;
|
auth_request_set $set_cookie $upstream_http_set_cookie;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||||
|
|
||||||
# redirect all traffic to https
|
# redirect all traffic to https
|
||||||
server {
|
server {
|
||||||
@@ -17,6 +17,8 @@ server {
|
|||||||
|
|
||||||
server_name _;
|
server_name _;
|
||||||
|
|
||||||
|
include /config/nginx/ssl.conf;
|
||||||
|
|
||||||
root /config/www;
|
root /config/www;
|
||||||
index index.html index.htm index.php;
|
index index.html index.htm index.php;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user