Compare commits

...

8 Commits

Author SHA1 Message Date
LinuxServer-CI
9357986f27 Bot Updating Package Versions 2023-04-18 16:17:59 +02:00
LinuxServer-CI
eb0bcf14dd Bot Updating Package Versions 2023-04-16 19:01:11 -05:00
LinuxServer-CI
97e2720b9c Bot Updating Package Versions 2023-04-16 23:53:59 +00:00
Eric Nemchik
7550f946ff Merge pull request #364 from linuxserver/move-ssl-include
ssl.conf include and authelia authorization changes
2023-04-16 18:50:00 -05:00
LinuxServer-CI
80705ccf19 Bot Updating Package Versions 2023-04-14 22:19:09 -05:00
Eric Nemchik
7a831681c5 Remove Authorization headers in authelia
Sort proxy_set_header in authelia and authentik
2023-04-13 11:26:13 -05:00
Eric Nemchik
43a7239fbf Move ssl.conf include to default.conf 2023-04-13 11:06:12 -05:00
LinuxServer-CI
73938cb4a1 Bot Updating Package Versions 2023-04-07 22:18:34 -05:00
6 changed files with 88 additions and 88 deletions

View File

@@ -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`.

View File

@@ -6,23 +6,23 @@ acme 2.5.0 python
alpine-baselayout 3.4.0-r0 apk alpine-baselayout 3.4.0-r0 apk
alpine-baselayout-data 3.4.0-r0 apk alpine-baselayout-data 3.4.0-r0 apk
alpine-keys 2.4-r1 apk alpine-keys 2.4-r1 apk
alpine-release 3.17.2-r0 apk alpine-release 3.17.3-r0 apk
aom-libs 3.5.0-r0 apk aom-libs 3.5.0-r0 apk
apache2-utils 2.4.56-r0 apk apache2-utils 2.4.57-r0 apk
apk-tools 2.12.10-r1 apk 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.3 python azure-core 1.26.4 python
azure-identity 1.12.0 python azure-identity 1.12.0 python
azure-mgmt-core 1.3.2 python 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.0 python beautifulsoup4 4.12.2 python
boto3 1.26.106 python boto3 1.26.115 python
botocore 1.29.106 python botocore 1.29.115 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.5.0 python certbot-dns-gehirn 2.5.0 python
certbot-dns-godaddy 0.2.2 python certbot-dns-godaddy 0.2.2 python
certbot-dns-google 2.5.0 python certbot-dns-google 2.5.0 python
certbot-dns-google-domains 0.1.9 python certbot-dns-google-domains 0.1.11 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 40.0.1 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.10.7 python filelock 3.11.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,8 +103,8 @@ 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.83.0 python google-api-python-client 2.86.0 python
google-auth 2.17.1 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
gpg 2.2.40-r0 apk gpg 2.2.40-r0 apk
@@ -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.1.0 python importlib-metadata 6.5.0 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
@@ -133,7 +133,7 @@ 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-r3 apk
libcurl 7.88.1-r1 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
libevent 2.1.12-r5 apk libevent 2.1.12-r5 apk
@@ -173,7 +173,7 @@ libxau 1.0.10-r0 apk
libxcb 1.15-r0 apk libxcb 1.15-r0 apk
libxdmcp 1.1.4-r0 apk libxdmcp 1.1.4-r0 apk
libxext 1.3.5-r0 apk libxext 1.3.5-r0 apk
libxml2 2.10.3-r1 apk libxml2 2.10.4-r0 apk
libxpm 3.5.15-r0 apk libxpm 3.5.15-r0 apk
libxslt 1.1.37-r1 apk libxslt 1.1.37-r1 apk
libxt 1.2.1-r0 apk libxt 1.2.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
@@ -226,43 +226,43 @@ 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-r3 apk
p11-kit 0.24.1-r1 apk p11-kit 0.24.1-r1 apk
packaging 23.0 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-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.18 binary
php-fpm 8.1.17 binary php-fpm 8.1.18 binary
php81 8.1.17-r0 apk php81 8.1.18-r0 apk
php81-bcmath 8.1.17-r0 apk php81-bcmath 8.1.18-r0 apk
php81-bz2 8.1.17-r0 apk php81-bz2 8.1.18-r0 apk
php81-common 8.1.17-r0 apk php81-common 8.1.18-r0 apk
php81-ctype 8.1.17-r0 apk php81-ctype 8.1.18-r0 apk
php81-curl 8.1.17-r0 apk php81-curl 8.1.18-r0 apk
php81-dom 8.1.17-r0 apk php81-dom 8.1.18-r0 apk
php81-exif 8.1.17-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.17-r0 apk php81-ftp 8.1.18-r0 apk
php81-gd 8.1.17-r0 apk php81-gd 8.1.18-r0 apk
php81-gmp 8.1.17-r0 apk php81-gmp 8.1.18-r0 apk
php81-iconv 8.1.17-r0 apk php81-iconv 8.1.18-r0 apk
php81-imap 8.1.17-r0 apk php81-imap 8.1.18-r0 apk
php81-intl 8.1.17-r0 apk php81-intl 8.1.18-r0 apk
php81-ldap 8.1.17-r0 apk php81-ldap 8.1.18-r0 apk
php81-mbstring 8.1.17-r0 apk php81-mbstring 8.1.18-r0 apk
php81-mysqli 8.1.17-r0 apk php81-mysqli 8.1.18-r0 apk
php81-mysqlnd 8.1.17-r0 apk php81-mysqlnd 8.1.18-r0 apk
php81-opcache 8.1.17-r0 apk php81-opcache 8.1.18-r0 apk
php81-openssl 8.1.17-r0 apk php81-openssl 8.1.18-r0 apk
php81-pdo 8.1.17-r0 apk php81-pdo 8.1.18-r0 apk
php81-pdo_mysql 8.1.17-r0 apk php81-pdo_mysql 8.1.18-r0 apk
php81-pdo_odbc 8.1.17-r0 apk php81-pdo_odbc 8.1.18-r0 apk
php81-pdo_pgsql 8.1.17-r0 apk php81-pdo_pgsql 8.1.18-r0 apk
php81-pdo_sqlite 8.1.17-r0 apk php81-pdo_sqlite 8.1.18-r0 apk
php81-pear 8.1.17-r0 apk php81-pear 8.1.18-r0 apk
php81-pecl-apcu 5.1.22-r0 apk php81-pecl-apcu 5.1.22-r0 apk
php81-pecl-igbinary 3.2.12-r0 apk php81-pecl-igbinary 3.2.12-r0 apk
php81-pecl-mailparse 3.1.4-r0 apk php81-pecl-mailparse 3.1.4-r0 apk
@@ -270,29 +270,29 @@ php81-pecl-mcrypt 1.0.6-r0 apk
php81-pecl-memcached 3.2.0-r0 apk php81-pecl-memcached 3.2.0-r0 apk
php81-pecl-redis 5.3.7-r0 apk php81-pecl-redis 5.3.7-r0 apk
php81-pecl-xmlrpc 1.0.0_rc3-r0 apk php81-pecl-xmlrpc 1.0.0_rc3-r0 apk
php81-pgsql 8.1.17-r0 apk php81-pgsql 8.1.18-r0 apk
php81-phar 8.1.17-r0 apk php81-phar 8.1.18-r0 apk
php81-posix 8.1.17-r0 apk php81-posix 8.1.18-r0 apk
php81-session 8.1.17-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.17-r0 apk php81-soap 8.1.18-r0 apk
php81-sockets 8.1.17-r0 apk php81-sockets 8.1.18-r0 apk
php81-sodium 8.1.17-r0 apk php81-sodium 8.1.18-r0 apk
php81-sqlite3 8.1.17-r0 apk php81-sqlite3 8.1.18-r0 apk
php81-tokenizer 8.1.17-r0 apk php81-tokenizer 8.1.18-r0 apk
php81-xml 8.1.17-r0 apk php81-xml 8.1.18-r0 apk
php81-xmlreader 8.1.17-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.17-r0 apk php81-xsl 8.1.18-r0 apk
php81-zip 8.1.17-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.1 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
@@ -300,11 +300,11 @@ pyasn1 0.4.8 python
pyasn1-modules 0.2.8 python pyasn1-modules 0.2.8 python
pycparser 2.21 python pycparser 2.21 python
pyparsing 3.0.9 python pyparsing 3.0.9 python
python 3.10.10 binary python 3.10.11 binary
python-dateutil 2.8.2 python 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.11-r0 apk
pytz 2023.3 python pytz 2023.3 python
readline 8.2.0-r0 apk readline 8.2.0-r0 apk
requests 2.28.2 python requests 2.28.2 python
@@ -318,14 +318,14 @@ 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
tldextract 3.4.0 python tldextract 3.4.0 python
typing-inspect 0.8.0 python typing-inspect 0.8.0 python
typing_extensions 4.5.0 python typing_extensions 4.5.0 python
tzdata 2023b-r1 apk tzdata 2023c-r0 apk
unixodbc 2.3.11-r0 apk unixodbc 2.3.11-r0 apk
uritemplate 4.1.1 python uritemplate 4.1.1 python
urllib3 1.26.15 python urllib3 1.26.15 python
@@ -337,4 +337,4 @@ xz-libs 5.2.9-r0 apk
zipp 3.15.0 python zipp 3.15.0 python
zlib 1.2.13-r0 apk zlib 1.2.13-r0 apk
zope.interface 6.0 python zope.interface 6.0 python
zstd-libs 1.5.2-r9 apk zstd-libs 1.5.5-r0 apk

View File

@@ -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`." }

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;