mirror of
https://github.com/linuxserver/docker-swag.git
synced 2025-01-11 07:19:36 -05:00
Merge branch 'linuxserver:master' into master
This commit is contained in:
Giles Paterson
GitHub
commit
973abbefbb
@ -15,19 +15,19 @@ apr-util 1.6.3-r1 apk
|
||||
argon2-libs 20190702-r4 apk
|
||||
attrs 23.1.0 python
|
||||
azure-common 1.1.28 python
|
||||
azure-core 1.26.4 python
|
||||
azure-core 1.27.0 python
|
||||
azure-identity 1.13.0 python
|
||||
azure-mgmt-core 1.4.0 python
|
||||
azure-mgmt-dns 8.0.0 python
|
||||
bash 5.2.15-r5 apk
|
||||
beautifulsoup4 4.12.2 python
|
||||
boto3 1.26.143 python
|
||||
botocore 1.29.143 python
|
||||
boto3 1.26.151 python
|
||||
botocore 1.29.151 python
|
||||
brotli-libs 1.0.9-r14 apk
|
||||
bs4 0.0.1 python
|
||||
busybox 1.36.0 binary
|
||||
busybox 1.36.0-r9 apk
|
||||
busybox-binsh 1.36.0-r9 apk
|
||||
busybox 1.36.1 binary
|
||||
busybox 1.36.1-r0 apk
|
||||
busybox-binsh 1.36.1-r0 apk
|
||||
c-client 2007f-r15 apk
|
||||
ca-certificates 20230506-r0 apk
|
||||
ca-certificates-bundle 20230506-r0 apk
|
||||
@ -78,8 +78,8 @@ charset-normalizer 3.1.0 python
|
||||
cloudflare 2.11.6 python
|
||||
configobj 5.0.8 python
|
||||
coreutils 9.3-r1 apk
|
||||
cryptography 41.0.0 python
|
||||
curl 8.1.1-r1 apk
|
||||
cryptography 41.0.1 python
|
||||
curl 8.1.2-r0 apk
|
||||
dataclasses-json 0.5.7 python
|
||||
distro 1.8.0 python
|
||||
dns-lexicon 3.11.7 python
|
||||
@ -106,7 +106,7 @@ gnupg-wks-client 2.4.1-r1 apk
|
||||
gnutls 3.8.0-r2 apk
|
||||
google-api-core 2.11.0 python
|
||||
google-api-python-client 2.88.0 python
|
||||
google-auth 2.19.0 python
|
||||
google-auth 2.19.1 python
|
||||
google-auth-httplib2 0.1.0 python
|
||||
googleapis-common-protos 1.59.0 python
|
||||
gpg 2.4.1-r1 apk
|
||||
@ -135,8 +135,8 @@ libbsd 0.11.7-r1 apk
|
||||
libbz2 1.0.8-r5 apk
|
||||
libc-utils 0.7.2-r5 apk
|
||||
libcrypto3 3.1.1-r1 apk
|
||||
libcurl 8.1.1-r1 apk
|
||||
libdav1d 1.2.0-r0 apk
|
||||
libcurl 8.1.2-r0 apk
|
||||
libdav1d 1.2.1-r0 apk
|
||||
libedit 20221030.3.1-r1 apk
|
||||
libevent 2.1.12-r6 apk
|
||||
libexpat 2.5.0-r1 apk
|
||||
@ -170,7 +170,7 @@ libssl3 3.1.1-r1 apk
|
||||
libstdc++ 12.2.1_git20220924-r10 apk
|
||||
libtasn1 4.19.0-r1 apk
|
||||
libunistring 1.1-r1 apk
|
||||
libuuid 2.38.1-r7 apk
|
||||
libuuid 2.38.1-r8 apk
|
||||
libwebp 1.3.0-r2 apk
|
||||
libx11 1.8.4-r3 apk
|
||||
libxau 1.0.11-r2 apk
|
||||
@ -226,7 +226,7 @@ nginx-vim 1.24.0-r6 apk
|
||||
npth 1.6-r4 apk
|
||||
oauthlib 3.2.2 python
|
||||
oniguruma 6.9.8-r1 apk
|
||||
openssl 3.1.0-r4 apk
|
||||
openssl 3.1.1-r1 apk
|
||||
p11-kit 0.24.1-r2 apk
|
||||
packaging 23.1 python
|
||||
parsedatetime 2.6 python
|
||||
@ -235,57 +235,57 @@ pcre2 10.42-r1 apk
|
||||
perl 5.36.1-r2 apk
|
||||
perl-error 0.17029-r1 apk
|
||||
perl-git 2.40.1-r0 apk
|
||||
php-cli 8.2.6 binary
|
||||
php-fpm 8.2.6 binary
|
||||
php82 8.2.6-r1 apk
|
||||
php82-bcmath 8.2.6-r1 apk
|
||||
php82-bz2 8.2.6-r1 apk
|
||||
php82-common 8.2.6-r1 apk
|
||||
php82-ctype 8.2.6-r1 apk
|
||||
php82-curl 8.2.6-r1 apk
|
||||
php82-dom 8.2.6-r1 apk
|
||||
php82-exif 8.2.6-r1 apk
|
||||
php82-fileinfo 8.2.6-r1 apk
|
||||
php82-fpm 8.2.6-r1 apk
|
||||
php82-ftp 8.2.6-r1 apk
|
||||
php82-gd 8.2.6-r1 apk
|
||||
php82-gmp 8.2.6-r1 apk
|
||||
php82-iconv 8.2.6-r1 apk
|
||||
php82-imap 8.2.6-r1 apk
|
||||
php82-intl 8.2.6-r1 apk
|
||||
php82-ldap 8.2.6-r1 apk
|
||||
php82-mbstring 8.2.6-r1 apk
|
||||
php82-mysqli 8.2.6-r1 apk
|
||||
php82-mysqlnd 8.2.6-r1 apk
|
||||
php82-opcache 8.2.6-r1 apk
|
||||
php82-openssl 8.2.6-r1 apk
|
||||
php82-pdo 8.2.6-r1 apk
|
||||
php82-pdo_mysql 8.2.6-r1 apk
|
||||
php82-pdo_odbc 8.2.6-r1 apk
|
||||
php82-pdo_pgsql 8.2.6-r1 apk
|
||||
php82-pdo_sqlite 8.2.6-r1 apk
|
||||
php82-pear 8.2.6-r1 apk
|
||||
php-cli 8.2.7 binary
|
||||
php-fpm 8.2.7 binary
|
||||
php82 8.2.7-r0 apk
|
||||
php82-bcmath 8.2.7-r0 apk
|
||||
php82-bz2 8.2.7-r0 apk
|
||||
php82-common 8.2.7-r0 apk
|
||||
php82-ctype 8.2.7-r0 apk
|
||||
php82-curl 8.2.7-r0 apk
|
||||
php82-dom 8.2.7-r0 apk
|
||||
php82-exif 8.2.7-r0 apk
|
||||
php82-fileinfo 8.2.7-r0 apk
|
||||
php82-fpm 8.2.7-r0 apk
|
||||
php82-ftp 8.2.7-r0 apk
|
||||
php82-gd 8.2.7-r0 apk
|
||||
php82-gmp 8.2.7-r0 apk
|
||||
php82-iconv 8.2.7-r0 apk
|
||||
php82-imap 8.2.7-r0 apk
|
||||
php82-intl 8.2.7-r0 apk
|
||||
php82-ldap 8.2.7-r0 apk
|
||||
php82-mbstring 8.2.7-r0 apk
|
||||
php82-mysqli 8.2.7-r0 apk
|
||||
php82-mysqlnd 8.2.7-r0 apk
|
||||
php82-opcache 8.2.7-r0 apk
|
||||
php82-openssl 8.2.7-r0 apk
|
||||
php82-pdo 8.2.7-r0 apk
|
||||
php82-pdo_mysql 8.2.7-r0 apk
|
||||
php82-pdo_odbc 8.2.7-r0 apk
|
||||
php82-pdo_pgsql 8.2.7-r0 apk
|
||||
php82-pdo_sqlite 8.2.7-r0 apk
|
||||
php82-pear 8.2.7-r0 apk
|
||||
php82-pecl-apcu 5.1.22-r0 apk
|
||||
php82-pecl-igbinary 3.2.14-r0 apk
|
||||
php82-pecl-mcrypt 1.0.6-r0 apk
|
||||
php82-pecl-memcached 3.2.0-r1 apk
|
||||
php82-pecl-msgpack 2.2.0_rc2-r1 apk
|
||||
php82-pecl-msgpack 2.2.0-r0 apk
|
||||
php82-pecl-redis 5.3.7-r2 apk
|
||||
php82-pgsql 8.2.6-r1 apk
|
||||
php82-phar 8.2.6-r1 apk
|
||||
php82-posix 8.2.6-r1 apk
|
||||
php82-session 8.2.6-r1 apk
|
||||
php82-simplexml 8.2.6-r1 apk
|
||||
php82-soap 8.2.6-r1 apk
|
||||
php82-sockets 8.2.6-r1 apk
|
||||
php82-sodium 8.2.6-r1 apk
|
||||
php82-sqlite3 8.2.6-r1 apk
|
||||
php82-tokenizer 8.2.6-r1 apk
|
||||
php82-xml 8.2.6-r1 apk
|
||||
php82-xmlreader 8.2.6-r1 apk
|
||||
php82-xmlwriter 8.2.6-r1 apk
|
||||
php82-xsl 8.2.6-r1 apk
|
||||
php82-zip 8.2.6-r1 apk
|
||||
php82-pgsql 8.2.7-r0 apk
|
||||
php82-phar 8.2.7-r0 apk
|
||||
php82-posix 8.2.7-r0 apk
|
||||
php82-session 8.2.7-r0 apk
|
||||
php82-simplexml 8.2.7-r0 apk
|
||||
php82-soap 8.2.7-r0 apk
|
||||
php82-sockets 8.2.7-r0 apk
|
||||
php82-sodium 8.2.7-r0 apk
|
||||
php82-sqlite3 8.2.7-r0 apk
|
||||
php82-tokenizer 8.2.7-r0 apk
|
||||
php82-xml 8.2.7-r0 apk
|
||||
php82-xmlreader 8.2.7-r0 apk
|
||||
php82-xmlwriter 8.2.7-r0 apk
|
||||
php82-xsl 8.2.7-r0 apk
|
||||
php82-zip 8.2.7-r0 apk
|
||||
pinentry 1.2.1-r1 apk
|
||||
pip 23.1.2 python
|
||||
pkb-client 1.2 python
|
||||
@ -302,18 +302,18 @@ pyasn1-modules 0.3.0 python
|
||||
pyc 0.1-r0 apk
|
||||
pycparser 2.21 python
|
||||
pyparsing 3.0.9 python
|
||||
python 3.11.3 binary
|
||||
python 3.11.4 binary
|
||||
python-dateutil 2.8.2 python
|
||||
python-digitalocean 1.17.0 python
|
||||
python-transip 0.6.0 python
|
||||
python3 3.11.3-r11 apk
|
||||
python3-pyc 3.11.3-r11 apk
|
||||
python3-pycache-pyc0 3.11.3-r11 apk
|
||||
python3 3.11.4-r0 apk
|
||||
python3-pyc 3.11.4-r0 apk
|
||||
python3-pycache-pyc0 3.11.4-r0 apk
|
||||
pytz 2023.3 python
|
||||
readline 8.2.1-r1 apk
|
||||
requests 2.31.0 python
|
||||
requests-file 1.5.1 python
|
||||
requests-mock 1.10.0 python
|
||||
requests-mock 1.11.0 python
|
||||
requests-oauthlib 1.3.1 python
|
||||
rsa 4.9 python
|
||||
s3transfer 0.6.1 python
|
||||
@ -324,11 +324,11 @@ six 1.16.0 python
|
||||
skalibs 2.13.1.1-r1 apk
|
||||
soupsieve 2.4.1 python
|
||||
sqlite-libs 3.41.2-r2 apk
|
||||
ssl_client 1.36.0-r9 apk
|
||||
ssl_client 1.36.1-r0 apk
|
||||
tiff 4.5.0-r6 apk
|
||||
tldextract 3.4.4 python
|
||||
typing-inspect 0.9.0 python
|
||||
typing_extensions 4.6.2 python
|
||||
typing_extensions 4.6.3 python
|
||||
tzdata 2023c-r1 apk
|
||||
unixodbc 2.3.11-r2 apk
|
||||
uritemplate 4.1.1 python
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||
## Version 2023/06/05 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||
|
||||
# redirect all traffic to https
|
||||
server {
|
||||
@ -52,6 +52,19 @@ server {
|
||||
}
|
||||
|
||||
location ~ ^(.+\.php)(.*)$ {
|
||||
# enable the next two lines for http auth
|
||||
#auth_basic "Restricted";
|
||||
#auth_basic_user_file /config/nginx/.htpasswd;
|
||||
|
||||
# enable for ldap auth (requires ldap-server.conf in the server block)
|
||||
#include /config/nginx/ldap-location.conf;
|
||||
|
||||
# enable for Authelia (requires authelia-server.conf in the server block)
|
||||
#include /config/nginx/authelia-location.conf;
|
||||
|
||||
# enable for Authentik (requires authentik-server.conf in the server block)
|
||||
#include /config/nginx/authentik-location.conf;
|
||||
|
||||
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
||||
fastcgi_pass 127.0.0.1:9000;
|
||||
fastcgi_index index.php;
|
||||
|
||||
@ -30,12 +30,12 @@ if [[ "${VALIDATION}" = "dns" ]] && [[ ! "${DNSPLUGIN}" =~ ^(acmedns|aliyun|azur
|
||||
fi
|
||||
|
||||
# copy dns default configs
|
||||
cp -n /defaults/dns-conf/* /config/dns-conf/
|
||||
cp -n /defaults/dns-conf/* /config/dns-conf/ 2> >(grep -v 'cp: not replacing')
|
||||
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/
|
||||
cp -nR /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
|
||||
|
||||
@ -15,7 +15,7 @@ if [[ ! -f /config/crontabs/root ]]; then
|
||||
|
||||
# if crontabs still do not exist in config (were not copied from system)
|
||||
# copy crontab from included defaults (using -n, do not overwrite an existing file)
|
||||
cp -n /etc/crontabs/root /config/crontabs/
|
||||
cp -n /etc/crontabs/root /config/crontabs/ 2> >(grep -v 'cp: not replacing')
|
||||
fi
|
||||
# set permissions and import user crontabs
|
||||
lsiown root:root /config/crontabs/root
|
||||
@ -31,7 +31,7 @@ if [[ ! -f /config/crontabs/abc ]]; then
|
||||
|
||||
# if crontabs still do not exist in config (were not copied from system)
|
||||
# copy crontab from included defaults (using -n, do not overwrite an existing file)
|
||||
cp -n /etc/crontabs/abc /config/crontabs/
|
||||
cp -n /etc/crontabs/abc /config/crontabs/ 2> >(grep -v 'cp: not replacing')
|
||||
fi
|
||||
# set permissions and import user crontabs
|
||||
lsiown abc:abc /config/crontabs/abc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user