Compare commits

...

11 Commits

Author SHA1 Message Date
LinuxServer-CI
bee6793d45 Bot Updating Package Versions 2023-06-09 14:21:26 +00:00
Eric Nemchik
29e9daa606 Merge pull request #381 from linuxserver/suppress-not-replacing
Suppress cp: not replacing
2023-06-09 09:17:40 -05:00
LinuxServer-CI
57c0d1f81e Bot Updating Package Versions 2023-06-07 12:44:02 +00:00
Eric Nemchik
416bef8a2e Merge pull request #383 from linuxserver/php-auth
Add auth comments for php location
2023-06-07 07:39:45 -05:00
Eric Nemchik
500d5606e4 Update default.conf.sample date 2023-06-05 13:41:08 -05:00
Eric Nemchik
500fd0c634 Add auth comments for php location 2023-06-05 13:37:01 -05:00
LinuxServer-CI
adf38bcd2b Bot Updating Package Versions 2023-06-03 03:17:12 +00:00
Eric Nemchik
5255b117f9 Suppress cp: not replacing
Signed-off-by: Eric Nemchik <eric@nemchik.com>
2023-06-01 19:09:13 -05:00
LinuxServer-CI
60f6fafc53 Bot Updating Package Versions 2023-05-31 04:10:29 +00:00
Eric Nemchik
d5c530af49 Merge pull request #375 from linuxserver/fail2ban-plex-regex
Remove broken fail2ban plex regex
2023-05-30 23:06:49 -05:00
Eric Nemchik
be215d62aa Remove broken fail2ban plex regex
Signed-off-by: Eric Nemchik <eric@nemchik.com>
2023-05-30 21:38:25 -05:00
5 changed files with 87 additions and 76 deletions

View File

@@ -15,19 +15,19 @@ apr-util 1.6.3-r1 apk
argon2-libs 20190702-r4 apk argon2-libs 20190702-r4 apk
attrs 23.1.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.27.0 python
azure-identity 1.13.0 python azure-identity 1.13.0 python
azure-mgmt-core 1.4.0 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-r5 apk bash 5.2.15-r5 apk
beautifulsoup4 4.12.2 python beautifulsoup4 4.12.2 python
boto3 1.26.142 python boto3 1.26.150 python
botocore 1.29.142 python botocore 1.29.150 python
brotli-libs 1.0.9-r14 apk brotli-libs 1.0.9-r14 apk
bs4 0.0.1 python bs4 0.0.1 python
busybox 1.36.0 binary busybox 1.36.1 binary
busybox 1.36.0-r9 apk busybox 1.36.1-r0 apk
busybox-binsh 1.36.0-r9 apk busybox-binsh 1.36.1-r0 apk
c-client 2007f-r15 apk c-client 2007f-r15 apk
ca-certificates 20230506-r0 apk ca-certificates 20230506-r0 apk
ca-certificates-bundle 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk
@@ -78,8 +78,8 @@ charset-normalizer 3.1.0 python
cloudflare 2.11.6 python cloudflare 2.11.6 python
configobj 5.0.8 python configobj 5.0.8 python
coreutils 9.3-r1 apk coreutils 9.3-r1 apk
cryptography 40.0.2 python cryptography 41.0.1 python
curl 8.1.1-r1 apk curl 8.1.2-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
@@ -106,7 +106,7 @@ gnupg-wks-client 2.4.1-r1 apk
gnutls 3.8.0-r2 apk gnutls 3.8.0-r2 apk
google-api-core 2.11.0 python google-api-core 2.11.0 python
google-api-python-client 2.88.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 google-auth-httplib2 0.1.0 python
googleapis-common-protos 1.59.0 python googleapis-common-protos 1.59.0 python
gpg 2.4.1-r1 apk gpg 2.4.1-r1 apk
@@ -134,9 +134,9 @@ libavif 0.11.1-r2 apk
libbsd 0.11.7-r1 apk libbsd 0.11.7-r1 apk
libbz2 1.0.8-r5 apk libbz2 1.0.8-r5 apk
libc-utils 0.7.2-r5 apk libc-utils 0.7.2-r5 apk
libcrypto3 3.1.0-r4 apk libcrypto3 3.1.1-r1 apk
libcurl 8.1.1-r1 apk libcurl 8.1.2-r0 apk
libdav1d 1.2.0-r0 apk libdav1d 1.2.1-r0 apk
libedit 20221030.3.1-r1 apk libedit 20221030.3.1-r1 apk
libevent 2.1.12-r6 apk libevent 2.1.12-r6 apk
libexpat 2.5.0-r1 apk libexpat 2.5.0-r1 apk
@@ -166,11 +166,11 @@ libsasl 2.1.28-r4 apk
libseccomp 2.5.4-r2 apk libseccomp 2.5.4-r2 apk
libsm 1.2.4-r1 apk libsm 1.2.4-r1 apk
libsodium 1.0.18-r3 apk libsodium 1.0.18-r3 apk
libssl3 3.1.0-r4 apk libssl3 3.1.1-r1 apk
libstdc++ 12.2.1_git20220924-r10 apk libstdc++ 12.2.1_git20220924-r10 apk
libtasn1 4.19.0-r1 apk libtasn1 4.19.0-r1 apk
libunistring 1.1-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 libwebp 1.3.0-r2 apk
libx11 1.8.4-r3 apk libx11 1.8.4-r3 apk
libxau 1.0.11-r2 apk libxau 1.0.11-r2 apk
@@ -226,7 +226,7 @@ nginx-vim 1.24.0-r6 apk
npth 1.6-r4 apk npth 1.6-r4 apk
oauthlib 3.2.2 python oauthlib 3.2.2 python
oniguruma 6.9.8-r1 apk 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 p11-kit 0.24.1-r2 apk
packaging 23.1 python packaging 23.1 python
parsedatetime 2.6 python parsedatetime 2.6 python
@@ -235,57 +235,57 @@ pcre2 10.42-r1 apk
perl 5.36.1-r2 apk perl 5.36.1-r2 apk
perl-error 0.17029-r1 apk perl-error 0.17029-r1 apk
perl-git 2.40.1-r0 apk perl-git 2.40.1-r0 apk
php-cli 8.2.6 binary php-cli 8.2.7 binary
php-fpm 8.2.6 binary php-fpm 8.2.7 binary
php82 8.2.6-r1 apk php82 8.2.7-r0 apk
php82-bcmath 8.2.6-r1 apk php82-bcmath 8.2.7-r0 apk
php82-bz2 8.2.6-r1 apk php82-bz2 8.2.7-r0 apk
php82-common 8.2.6-r1 apk php82-common 8.2.7-r0 apk
php82-ctype 8.2.6-r1 apk php82-ctype 8.2.7-r0 apk
php82-curl 8.2.6-r1 apk php82-curl 8.2.7-r0 apk
php82-dom 8.2.6-r1 apk php82-dom 8.2.7-r0 apk
php82-exif 8.2.6-r1 apk php82-exif 8.2.7-r0 apk
php82-fileinfo 8.2.6-r1 apk php82-fileinfo 8.2.7-r0 apk
php82-fpm 8.2.6-r1 apk php82-fpm 8.2.7-r0 apk
php82-ftp 8.2.6-r1 apk php82-ftp 8.2.7-r0 apk
php82-gd 8.2.6-r1 apk php82-gd 8.2.7-r0 apk
php82-gmp 8.2.6-r1 apk php82-gmp 8.2.7-r0 apk
php82-iconv 8.2.6-r1 apk php82-iconv 8.2.7-r0 apk
php82-imap 8.2.6-r1 apk php82-imap 8.2.7-r0 apk
php82-intl 8.2.6-r1 apk php82-intl 8.2.7-r0 apk
php82-ldap 8.2.6-r1 apk php82-ldap 8.2.7-r0 apk
php82-mbstring 8.2.6-r1 apk php82-mbstring 8.2.7-r0 apk
php82-mysqli 8.2.6-r1 apk php82-mysqli 8.2.7-r0 apk
php82-mysqlnd 8.2.6-r1 apk php82-mysqlnd 8.2.7-r0 apk
php82-opcache 8.2.6-r1 apk php82-opcache 8.2.7-r0 apk
php82-openssl 8.2.6-r1 apk php82-openssl 8.2.7-r0 apk
php82-pdo 8.2.6-r1 apk php82-pdo 8.2.7-r0 apk
php82-pdo_mysql 8.2.6-r1 apk php82-pdo_mysql 8.2.7-r0 apk
php82-pdo_odbc 8.2.6-r1 apk php82-pdo_odbc 8.2.7-r0 apk
php82-pdo_pgsql 8.2.6-r1 apk php82-pdo_pgsql 8.2.7-r0 apk
php82-pdo_sqlite 8.2.6-r1 apk php82-pdo_sqlite 8.2.7-r0 apk
php82-pear 8.2.6-r1 apk php82-pear 8.2.7-r0 apk
php82-pecl-apcu 5.1.22-r0 apk php82-pecl-apcu 5.1.22-r0 apk
php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-igbinary 3.2.14-r0 apk
php82-pecl-mcrypt 1.0.6-r0 apk php82-pecl-mcrypt 1.0.6-r0 apk
php82-pecl-memcached 3.2.0-r1 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-pecl-redis 5.3.7-r2 apk
php82-pgsql 8.2.6-r1 apk php82-pgsql 8.2.7-r0 apk
php82-phar 8.2.6-r1 apk php82-phar 8.2.7-r0 apk
php82-posix 8.2.6-r1 apk php82-posix 8.2.7-r0 apk
php82-session 8.2.6-r1 apk php82-session 8.2.7-r0 apk
php82-simplexml 8.2.6-r1 apk php82-simplexml 8.2.7-r0 apk
php82-soap 8.2.6-r1 apk php82-soap 8.2.7-r0 apk
php82-sockets 8.2.6-r1 apk php82-sockets 8.2.7-r0 apk
php82-sodium 8.2.6-r1 apk php82-sodium 8.2.7-r0 apk
php82-sqlite3 8.2.6-r1 apk php82-sqlite3 8.2.7-r0 apk
php82-tokenizer 8.2.6-r1 apk php82-tokenizer 8.2.7-r0 apk
php82-xml 8.2.6-r1 apk php82-xml 8.2.7-r0 apk
php82-xmlreader 8.2.6-r1 apk php82-xmlreader 8.2.7-r0 apk
php82-xmlwriter 8.2.6-r1 apk php82-xmlwriter 8.2.7-r0 apk
php82-xsl 8.2.6-r1 apk php82-xsl 8.2.7-r0 apk
php82-zip 8.2.6-r1 apk php82-zip 8.2.7-r0 apk
pinentry 1.2.1-r1 apk pinentry 1.2.1-r1 apk
pip 23.1.2 python pip 23.1.2 python
pkb-client 1.2 python pkb-client 1.2 python
@@ -294,7 +294,7 @@ portalocker 2.7.0 python
procps-ng 4.0.3-r1 apk procps-ng 4.0.3-r1 apk
protobuf 4.23.2 python protobuf 4.23.2 python
publicsuffixlist 0.9.4 python publicsuffixlist 0.9.4 python
pyOpenSSL 23.1.1 python pyOpenSSL 23.2.0 python
pyRFC3339 1.1 python pyRFC3339 1.1 python
pyacmedns 0.4 python pyacmedns 0.4 python
pyasn1 0.5.0 python pyasn1 0.5.0 python
@@ -302,18 +302,18 @@ pyasn1-modules 0.3.0 python
pyc 0.1-r0 apk pyc 0.1-r0 apk
pycparser 2.21 python pycparser 2.21 python
pyparsing 3.0.9 python pyparsing 3.0.9 python
python 3.11.3 binary python 3.11.4 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.11.3-r11 apk python3 3.11.4-r0 apk
python3-pyc 3.11.3-r11 apk python3-pyc 3.11.4-r0 apk
python3-pycache-pyc0 3.11.3-r11 apk python3-pycache-pyc0 3.11.4-r0 apk
pytz 2023.3 python pytz 2023.3 python
readline 8.2.1-r1 apk readline 8.2.1-r1 apk
requests 2.31.0 python requests 2.31.0 python
requests-file 1.5.1 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 requests-oauthlib 1.3.1 python
rsa 4.9 python rsa 4.9 python
s3transfer 0.6.1 python s3transfer 0.6.1 python
@@ -324,11 +324,11 @@ six 1.16.0 python
skalibs 2.13.1.1-r1 apk skalibs 2.13.1.1-r1 apk
soupsieve 2.4.1 python soupsieve 2.4.1 python
sqlite-libs 3.41.2-r2 apk 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 tiff 4.5.0-r6 apk
tldextract 3.4.4 python tldextract 3.4.4 python
typing-inspect 0.9.0 python typing-inspect 0.9.0 python
typing_extensions 4.6.2 python typing_extensions 4.6.3 python
tzdata 2023c-r1 apk tzdata 2023c-r1 apk
unixodbc 2.3.11-r2 apk unixodbc 2.3.11-r2 apk
uritemplate 4.1.1 python uritemplate 4.1.1 python

View File

@@ -3,5 +3,3 @@
[Definition] [Definition]
failregex = ^<HOST>.*"(GET|POST|HEAD).*" (401) .*$ failregex = ^<HOST>.*"(GET|POST|HEAD).*" (401) .*$
ignoreregex = .*(?i)plex.*

View File

@@ -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 # redirect all traffic to https
server { server {
@@ -52,6 +52,19 @@ server {
} }
location ~ ^(.+\.php)(.*)$ { 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_split_path_info ^(.+\.php)(.*)$;
fastcgi_pass 127.0.0.1:9000; fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php; fastcgi_index index.php;

View File

@@ -30,12 +30,12 @@ if [[ "${VALIDATION}" = "dns" ]] && [[ ! "${DNSPLUGIN}" =~ ^(acmedns|aliyun|azur
fi fi
# copy dns default configs # 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 lsiown -R abc:abc /config/dns-conf
# copy default renewal hooks # copy default renewal hooks
chmod -R +x /defaults/etc/letsencrypt/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 lsiown -R abc:abc /config/etc/letsencrypt/renewal-hooks
# replace nginx service location in renewal hooks # replace nginx service location in renewal hooks

View File

@@ -15,7 +15,7 @@ if [[ ! -f /config/crontabs/root ]]; then
# if crontabs still do not exist in config (were not copied from system) # 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) # 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 fi
# set permissions and import user crontabs # set permissions and import user crontabs
lsiown root:root /config/crontabs/root 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) # 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) # 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 fi
# set permissions and import user crontabs # set permissions and import user crontabs
lsiown abc:abc /config/crontabs/abc lsiown abc:abc /config/crontabs/abc