diff --git a/Jenkinsfile b/Jenkinsfile index 0e91b98..a8021da 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -76,6 +76,7 @@ pipeline { ''' script{ env.EXIT_STATUS = '' + env.CI_TEST_ATTEMPTED = '' env.LS_RELEASE = sh( script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() @@ -283,7 +284,7 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + ghcr.io/linuxserver/baseimage-alpine:3.23 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ apk add --no-cache python3 && \ python3 -m venv /lsiopy && \ pip install --no-cache-dir -U pip && \ @@ -871,6 +872,7 @@ pipeline { script{ env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json' + env.CI_TEST_ATTEMPTED = 'true' } sh '''#! /bin/bash set -e @@ -1073,98 +1075,13 @@ EOF ) ''' } } - // If this is a Pull request send the CI link as a comment on it - stage('Pull Request Comment') { - when { - not {environment name: 'CHANGE_ID', value: ''} - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh '''#! /bin/bash - # Function to retrieve JSON data from URL - get_json() { - local url="$1" - local response=$(curl -s "$url") - if [ $? -ne 0 ]; then - echo "Failed to retrieve JSON data from $url" - return 1 - fi - local json=$(echo "$response" | jq .) - if [ $? -ne 0 ]; then - echo "Failed to parse JSON data from $url" - return 1 - fi - echo "$json" - } - - build_table() { - local data="$1" - - # Get the keys in the JSON data - local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') - - # Check if keys are empty - if [ -z "$keys" ]; then - echo "JSON report data does not contain any keys or the report does not exist." - return 1 - fi - - # Build table header - local header="| Tag | Passed |\\n| --- | --- |\\n" - - # Loop through the JSON data to build the table rows - local rows="" - for build in $keys; do - local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") - if [ "$status" = "true" ]; then - status="✅" - else - status="❌" - fi - local row="| "$build" | "$status" |\\n" - rows="${rows}${row}" - done - - local table="${header}${rows}" - local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') - echo "$escaped_table" - } - - if [[ "${CI}" = "true" ]]; then - # Retrieve JSON data from URL - data=$(get_json "$CI_JSON_URL") - # Create table from JSON data - table=$(build_table "$data") - echo -e "$table" - - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" - else - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" - fi - ''' - - } - } } /* ###################### - Send status to Discord + Comment on PR and Send status to Discord ###################### */ post { always { - sh '''#!/bin/bash - rm -rf /config/.ssh/id_sign - rm -rf /config/.ssh/id_sign.pub - git config --global --unset gpg.format - git config --global --unset user.signingkey - git config --global --unset commit.gpgsign - ''' - script{ + script { env.JOB_DATE = sh( script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', returnStdout: true).trim() @@ -1207,6 +1124,87 @@ EOF "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } } + script { + if (env.GITHUBIMAGE =~ /lspipepr/){ + if (env.CI_TEST_ATTEMPTED == "true"){ + sh '''#! /bin/bash + # Function to retrieve JSON data from URL + get_json() { + local url="$1" + local response=$(curl -s "$url") + if [ $? -ne 0 ]; then + echo "Failed to retrieve JSON data from $url" + return 1 + fi + local json=$(echo "$response" | jq .) + if [ $? -ne 0 ]; then + echo "Failed to parse JSON data from $url" + return 1 + fi + echo "$json" + } + + build_table() { + local data="$1" + + # Get the keys in the JSON data + local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') + + # Check if keys are empty + if [ -z "$keys" ]; then + echo "JSON report data does not contain any keys or the report does not exist." + return 1 + fi + + # Build table header + local header="| Tag | Passed |\\n| --- | --- |\\n" + + # Loop through the JSON data to build the table rows + local rows="" + for build in $keys; do + local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") + if [ "$status" = "true" ]; then + status="✅" + else + status="❌" + fi + local row="| "$build" | "$status" |\\n" + rows="${rows}${row}" + done + + local table="${header}${rows}" + local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') + echo "$escaped_table" + } + + if [[ "${CI}" = "true" ]]; then + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" + + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + else + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + fi + ''' + } + } + } + sh '''#!/bin/bash + rm -rf /config/.ssh/id_sign + rm -rf /config/.ssh/id_sign.pub + git config --global --unset gpg.format + git config --global --unset user.signingkey + git config --global --unset commit.gpgsign + ''' } cleanup { sh '''#! /bin/bash diff --git a/README.md b/README.md index d72730f..a4e8e71 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ This image can be run with a read-only container filesystem. For details please To help you get started creating a container from this image you can either use docker-compose or the docker cli. >[!NOTE] ->Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided. +>Unless a parameter is flagged as 'optional', it is *mandatory* and a value must be provided. ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) diff --git a/package_versions.txt b/package_versions.txt index c49bac6..acd6e57 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ NAME VERSION TYPE Simple Launcher 1.1.0.14 binary (+5 duplicates) acl-libs 2.3.2-r1 apk -acme 5.3.0 python +acme 5.5.0 python alpine-baselayout 3.7.0-r0 apk alpine-baselayout-data 3.7.0-r0 apk alpine-keys 2.5-r0 apk @@ -12,18 +12,18 @@ apk-tools 2.14.9-r3 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk -attrs 25.4.0 python +attrs 26.1.0 python autocommand 2.2.2 python azure-common 1.1.28 python -azure-core 1.38.0 python -azure-identity 1.25.1 python +azure-core 1.40.0 python +azure-identity 1.25.3 python azure-mgmt-core 1.6.0 python azure-mgmt-dns 9.0.0 python backports-tarfile 1.2.0 python bash 5.2.37-r0 apk beautifulsoup4 4.14.3 python -boto3 1.42.44 python -botocore 1.42.44 python +boto3 1.43.2 python +botocore 1.43.2 python brotli-libs 1.1.0-r2 apk bs4 0.0.2 python busybox 1.37.0-r20 apk @@ -33,18 +33,18 @@ c-client 2007f-r15 apk ca-certificates 20250911-r0 apk ca-certificates-bundle 20250911-r0 apk catatonit 0.2.1-r0 apk -certbot 5.3.0 python +certbot 5.5.0 python certbot-dns-acmedns 0.1.0 python certbot-dns-aliyun 2.0.0 python certbot-dns-azure 1.5.0 python certbot-dns-bunny 3.0.0 python -certbot-dns-cloudflare 5.3.0 python +certbot-dns-cloudflare 5.5.0 python certbot-dns-cpanel 0.4.0 python certbot-dns-desec 1.3.2 python -certbot-dns-digitalocean 5.3.0 python +certbot-dns-digitalocean 5.5.0 python certbot-dns-directadmin 1.0.15 python -certbot-dns-dnsimple 5.3.0 python -certbot-dns-dnsmadeeasy 5.3.0 python +certbot-dns-dnsimple 5.5.0 python +certbot-dns-dnsmadeeasy 5.5.0 python certbot-dns-dnspod 0.1.0 python certbot-dns-do 0.31.0 python certbot-dns-domeneshop 0.2.9 python @@ -52,59 +52,58 @@ certbot-dns-dreamhost 1.0 python certbot-dns-duckdns 1.8.0 python certbot-dns-dynudns 0.0.6 python certbot-dns-freedns 0.2.0 python -certbot-dns-gehirn 5.3.0 python +certbot-dns-gehirn 5.5.0 python certbot-dns-glesys 2.1.0 python certbot-dns-godaddy 2.8.0 python -certbot-dns-google 5.3.0 python +certbot-dns-google 5.5.0 python certbot-dns-he 1.0.0 python -certbot-dns-hetzner 3.0.0 python +certbot-dns-hetzner 4.0.0 python certbot-dns-hetzner-cloud 1.0.5 python certbot-dns-infomaniak 0.2.4 python certbot-dns-inwx 3.0.3 python certbot-dns-ionos 2024.11.9 python -certbot-dns-linode 5.3.0 python +certbot-dns-linode 5.5.0 python certbot-dns-loopia 1.0.1 python -certbot-dns-luadns 5.3.0 python +certbot-dns-luadns 5.5.0 python certbot-dns-namecheap 1.0.0 python -certbot-dns-netcup 2.0.0 python +certbot-dns-netcup 2.0.3 python certbot-dns-njalla 2.0.2 python -certbot-dns-nsone 5.3.0 python -certbot-dns-ovh 5.3.0 python +certbot-dns-nsone 5.5.0 python +certbot-dns-ovh 5.5.0 python certbot-dns-porkbun 0.11.0 python -certbot-dns-rfc2136 5.3.0 python -certbot-dns-route53 5.3.0 python -certbot-dns-sakuracloud 5.3.0 python +certbot-dns-rfc2136 5.5.0 python +certbot-dns-route53 5.5.0 python +certbot-dns-sakuracloud 5.5.0 python certbot-dns-standalone 1.2.1 python certbot-dns-transip 0.5.2 python certbot-dns-vultr 1.1.0 python certbot-plugin-gandi 1.5.0 python -certifi 2026.1.4 python +certifi 2026.4.22 python cffi 2.0.0 python -charset-normalizer 3.4.4 python +charset-normalizer 3.4.7 python cli UNKNOWN binary cli-32 UNKNOWN binary cli-64 UNKNOWN binary cli-arm64 UNKNOWN binary cloudflare 2.19.4 python -composer 2.9.5 binary -configargparse 1.7.1 python +composer 2.9.7 binary +configargparse 1.7.5 python configobj 5.0.9 python coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk coreutils-fmt 9.7-r1 apk coreutils-sha512sum 9.7-r1 apk -cryptography 46.0.4 python +cryptography 47.0.0 python curl 8.14.1-r2 apk distro 1.9.0 python -dns-lexicon 3.23.2 python -dns-lexicon-coop 3.24.2 python +dns-lexicon 3.25.1 python dnslib 0.9.26 python dnspython 2.8.0 python domeneshop 0.4.4 python fail2ban 1.1.0 python fail2ban 1.1.0-r3 apk fail2ban-pyc 1.1.0-r3 apk -filelock 3.20.3 python +filelock 3.29.0 python findutils 4.10.0-r0 apk fontconfig 2.15.0-r3 apk freetype 2.13.3-r0 apk @@ -120,12 +119,12 @@ gnupg-gpgconf 2.4.9-r0 apk gnupg-keyboxd 2.4.9-r0 apk gnupg-utils 2.4.9-r0 apk gnupg-wks-client 2.4.9-r0 apk -gnutls 3.8.8-r0 apk -google-api-core 2.29.0 python -google-api-python-client 2.189.0 python -google-auth 2.48.0 python -google-auth-httplib2 0.3.0 python -googleapis-common-protos 1.72.0 python +gnutls 3.8.13-r0 apk +google-api-core 2.30.3 python +google-api-python-client 2.195.0 python +google-auth 2.50.0 python +google-auth-httplib2 0.3.1 python +googleapis-common-protos 1.74.0 python gpg 2.4.9-r0 apk gpg-agent 2.4.9-r0 apk gpg-wks-server 2.4.9-r0 apk @@ -135,11 +134,11 @@ gui UNKNOWN binary gui-32 UNKNOWN binary gui-64 UNKNOWN binary gui-arm64 UNKNOWN binary -hcloud 2.16.0 python +hcloud 2.19.0 python httplib2 0.31.2 python icu-data-en 76.1-r1 apk icu-libs 76.1-r1 apk -idna 3.11 python +idna 3.13 python importlib-metadata 8.7.1 python inotify-tools 4.23.9.0-r0 apk inotify-tools-libs 4.23.9.0-r0 apk @@ -162,12 +161,12 @@ libattr 2.5.2-r2 apk libavif 1.3.0-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.5.5-r0 apk +libcrypto3 3.5.6-r0 apk libcurl 8.14.1-r2 apk libdav1d 1.5.1-r0 apk libedit 20250104.3.1-r1 apk libevent 2.1.12-r8 apk -libexpat 2.7.4-r0 apk +libexpat 2.7.5-r0 apk libffi 3.4.8-r0 apk libgcc 14.2.0-r6 apk libgcrypt 1.10.3-r1 apk @@ -188,8 +187,8 @@ libmnl 1.0.5-r2 apk libncursesw 6.5_p20250503-r0 apk libnftnl 1.2.9-r0 apk libpanelw 6.5_p20250503-r0 apk -libpng 1.6.54-r0 apk -libpq 17.7-r0 apk +libpng 1.6.57-r0 apk +libpq 17.9-r0 apk libproc2 4.0.4-r3 apk libpsl 0.21.5-r3 apk libsasl 2.1.28-r8 apk @@ -197,7 +196,7 @@ libseccomp 2.6.0-r0 apk libsharpyuv 1.5.0-r0 apk libsm 1.2.5-r0 apk libsodium 1.0.20-r1 apk -libssl3 3.5.5-r0 apk +libssl3 3.5.6-r0 apk libstdc++ 14.2.0-r6 apk libtasn1 4.21.0-r0 apk libunistring 1.3-r0 apk @@ -209,7 +208,7 @@ libxcb 1.17.0-r0 apk libxdmcp 1.1.5-r1 apk libxext 1.3.6-r2 apk libxml2 2.13.9-r0 apk -libxpm 3.5.17-r0 apk +libxpm 3.5.19-r0 apk libxslt 1.1.43-r3 apk libxt 1.3.1-r0 apk libxtables 1.8.11-r1 apk @@ -218,50 +217,50 @@ libzip 1.11.4-r0 apk linux-pam 1.7.0-r4 apk logrotate 3.21.0-r1 apk loopialib 0.2.0 python -lxml 6.0.2 python +lxml 6.1.0 python lz4-libs 1.10.0-r0 apk markupsafe 3.0.3 python memcached 1.6.32-r0 apk mock 5.2.0 python more-itertools 10.8.0 python mpdecimal 4.0.1-r0 apk -msal 1.34.0 python +msal 1.36.0 python msal-extensions 1.3.1 python -musl 1.2.5-r10 apk -musl-utils 1.2.5-r10 apk -my-test-package 1.0 python +musl 1.2.5-r12 apk +musl-utils 1.2.5-r12 apk nano 8.4-r0 apk ncurses-terminfo-base 6.5_p20250503-r0 apk netcat-openbsd 1.229.1-r0 apk -nettle 3.10.1-r0 apk +nettle 3.10.2-r0 apk nghttp2-libs 1.65.0-r0 apk -nginx 1.28.2-r0 apk -nginx-mod-devel-kit 1.28.2-r0 apk -nginx-mod-http-brotli 1.28.2-r0 apk -nginx-mod-http-dav-ext 1.28.2-r0 apk -nginx-mod-http-echo 1.28.2-r0 apk -nginx-mod-http-fancyindex 1.28.2-r0 apk -nginx-mod-http-geoip2 1.28.2-r0 apk -nginx-mod-http-headers-more 1.28.2-r0 apk -nginx-mod-http-image-filter 1.28.2-r0 apk -nginx-mod-http-perl 1.28.2-r0 apk -nginx-mod-http-redis2 1.28.2-r0 apk -nginx-mod-http-set-misc 1.28.2-r0 apk -nginx-mod-http-upload-progress 1.28.2-r0 apk -nginx-mod-http-xslt-filter 1.28.2-r0 apk -nginx-mod-mail 1.28.2-r0 apk -nginx-mod-rtmp 1.28.2-r0 apk -nginx-mod-stream 1.28.2-r0 apk -nginx-mod-stream-geoip2 1.28.2-r0 apk -nginx-vim 1.28.2-r0 apk +nginx 1.28.3-r0 apk +nginx-mod-devel-kit 1.28.3-r0 apk +nginx-mod-http-brotli 1.28.3-r0 apk +nginx-mod-http-dav-ext 1.28.3-r0 apk +nginx-mod-http-echo 1.28.3-r0 apk +nginx-mod-http-fancyindex 1.28.3-r0 apk +nginx-mod-http-geoip2 1.28.3-r0 apk +nginx-mod-http-headers-more 1.28.3-r0 apk +nginx-mod-http-image-filter 1.28.3-r0 apk +nginx-mod-http-perl 1.28.3-r0 apk +nginx-mod-http-redis2 1.28.3-r0 apk +nginx-mod-http-set-misc 1.28.3-r0 apk +nginx-mod-http-upload-progress 1.28.3-r0 apk +nginx-mod-http-xslt-filter 1.28.3-r0 apk +nginx-mod-mail 1.28.3-r0 apk +nginx-mod-rtmp 1.28.3-r0 apk +nginx-mod-stream 1.28.3-r0 apk +nginx-mod-stream-geoip2 1.28.3-r0 apk +nginx-vim 1.28.3-r0 apk npth 1.8-r0 apk oniguruma 6.9.10-r0 apk -openssl 3.5.5-r0 apk +openssl 3.5.6-r0 apk p11-kit 0.25.5-r2 apk -packaging 26.0 python (+1 duplicate) +packaging 26.0 python +packaging 26.2 python parsedatetime 2.6 python pcre2 10.46-r0 apk -perl 5.40.3-r0 apk +perl 5.40.4-r0 apk perl-error 0.17030-r0 apk perl-git 2.49.1-r0 apk php84 8.4.16-r0 apk @@ -313,39 +312,39 @@ php84-xmlwriter 8.4.16-r0 apk php84-xsl 8.4.16-r0 apk php84-zip 8.4.16-r0 apk pinentry 1.3.1-r0 apk -pip 26.0.1 python -pkb-client 2.2.0 python +pip 26.1 python +pkb-client 2.3.1 python platformdirs 4.4.0 python popt 1.19-r4 apk procps-ng 4.0.4-r3 apk -proto-plus 1.27.1 python -protobuf 6.33.5 python +proto-plus 1.27.2 python +protobuf 7.34.1 python pyacmedns 0.4 python -pyasn1 0.6.2 python +pyasn1 0.6.3 python pyasn1-modules 0.4.2 python -pyc 3.12.12-r0 apk +pyc 3.12.13-r0 apk pycparser 3.0 python -pyjwt 2.11.0 python +pyjwt 2.12.1 python pynamecheap 0.0.3 python -pyopenssl 25.3.0 python +pyopenssl 26.1.0 python pyotp 2.9.0 python pyparsing 3.3.2 python pyrfc3339 2.1.0 python python-dateutil 2.9.0.post0 python python-digitalocean 1.17.0 python python-transip 0.6.0 python -python3 3.12.12-r0 apk -python3-pyc 3.12.12-r0 apk -python3-pycache-pyc0 3.12.12-r0 apk +python3 3.12.13-r0 apk +python3-pyc 3.12.13-r0 apk +python3-pycache-pyc0 3.12.13-r0 apk pyyaml 6.0.3 python readline 8.2.13-r1 apk -requests 2.32.5 python +requests 2.33.1 python requests-file 3.0.1 python requests-mock 1.12.1 python -rsa 4.9.1 python -s3transfer 0.16.0 python +requests-unixsocket 0.4.1 python +s3transfer 0.17.0 python scanelf 1.3.8-r1 apk -setuptools 81.0.0 python +setuptools 82.0.1 python shadow 4.17.3-r0 apk six 1.17.0 python skalibs-libs 2.14.4.0-r0 apk @@ -356,15 +355,16 @@ tiff 4.7.1-r0 apk tldextract 5.3.1 python tomli 2.4.0 python typing-extensions 4.15.0 python -tzdata 2025c-r0 apk +tzdata 2026a-r0 apk unixodbc 2.3.12-r0 apk uritemplate 4.2.0 python urllib3 2.6.3 python utmps-libs 0.1.3.1-r0 apk -wheel 0.46.3 python (+1 duplicate) +wheel 0.46.3 python +wheel 0.47.0 python whois 5.6.3-r0 apk -xz-libs 5.8.1-r0 apk +xz-libs 5.8.3-r0 apk zipp 3.23.0 python -zlib 1.3.1-r2 apk -zope-interface 8.2 python +zlib 1.3.2-r0 apk +zope-interface 8.4 python zstd-libs 1.5.7-r0 apk diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 0653f9c..016a7e9 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -44,8 +44,13 @@ server { # enable for Authelia (requires authelia-location.conf in the location block) #include /config/nginx/authelia-server.conf; + # enable for Authentik (requires authentik-location.conf in the location block) #include /config/nginx/authentik-server.conf; + + # enable for Tinyauth (requires tinyauth-location.conf in the location block) + #include /config/nginx/tinyauth-server.conf; + location / { # enable for basic auth #auth_basic "Restricted"; @@ -56,13 +61,18 @@ server { # 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; + + # enable for Tinyauth (requires tinyauth-server.conf in the server block) + #include /config/nginx/tinyauth-location.conf; + try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args; } location ~ ^(.+\.php)(.*)$ { - # enable the next two lines for http auth + # enable for basic auth #auth_basic "Restricted"; #auth_basic_user_file /config/nginx/.htpasswd; @@ -71,8 +81,13 @@ server { # 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; + + # enable for Tinyauth (requires tinyauth-server.conf in the server block) + #include /config/nginx/tinyauth-location.conf; + fastcgi_split_path_info ^(.+\.php)(.*)$; if (!-f $document_root$fastcgi_script_name) { return 404;