Merge pull request #467 from linuxserver/authelia-auth-endpoints

another authelia auth endpoint adjustment

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -67,10 +67,10 @@ body:
   - type: textarea
     attributes:
       description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs swag"
       label: Container logs
       placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs swag`
       render: bash
     validations:
       required: true

.github/workflows/external_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   external-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
         if: github.ref == 'refs/heads/master'

.github/workflows/external_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

.github/workflows/package_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   package-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: Package Trigger
         if: github.ref == 'refs/heads/master'

.github/workflows/package_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
 
 # set version label
 ARG BUILD_DATE
@@ -45,39 +45,39 @@ RUN \
     nginx-mod-stream \
     nginx-mod-stream-geoip2 \
     nginx-vim \
-    php82-bcmath \
+    php83-bcmath \
-    php82-bz2 \
+    php83-bz2 \
-    php82-dom \
+    php83-dom \
-    php82-exif \
+    php83-exif \
-    php82-ftp \
+    php83-ftp \
-    php82-gd \
+    php83-gd \
-    php82-gmp \
+    php83-gmp \
-    php82-imap \
+    php83-imap \
-    php82-intl \
+    php83-intl \
-    php82-ldap \
+    php83-ldap \
-    php82-mysqli \
+    php83-mysqli \
-    php82-mysqlnd \
+    php83-mysqlnd \
-    php82-opcache \
+    php83-opcache \
-    php82-pdo_mysql \
+    php83-pdo_mysql \
-    php82-pdo_odbc \
+    php83-pdo_odbc \
-    php82-pdo_pgsql \
+    php83-pdo_pgsql \
-    php82-pdo_sqlite \
+    php83-pdo_sqlite \
-    php82-pear \
+    php83-pear \
-    php82-pecl-apcu \
+    php83-pecl-apcu \
-    php82-pecl-memcached \
+    php83-pecl-memcached \
-    php82-pecl-redis \
+    php83-pecl-redis \
-    php82-pgsql \
+    php83-pgsql \
-    php82-posix \
+    php83-posix \
-    php82-soap \
+    php83-soap \
-    php82-sockets \
+    php83-sockets \
-    php82-sodium \
+    php83-sodium \
-    php82-sqlite3 \
+    php83-sqlite3 \
-    php82-tokenizer \
+    php83-tokenizer \
-    php82-xmlreader \
+    php83-xmlreader \
-    php82-xsl \
+    php83-xsl \
     whois && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    php82-pecl-mcrypt && \
+    php83-pecl-mcrypt && \
   echo "**** install certbot plugins ****" && \
   if [ -z ${CERTBOT_VERSION+x} ]; then \
     CERTBOT_VERSION=$(curl -sL  https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
@@ -86,11 +86,12 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
     certbot==${CERTBOT_VERSION} \
     certbot-dns-acmedns \
     certbot-dns-aliyun \
     certbot-dns-azure \
+    certbot-dns-bunny \
     certbot-dns-cloudflare \
     certbot-dns-cpanel \
     certbot-dns-desec \
@@ -101,9 +102,11 @@ RUN \
     certbot-dns-dnspod \
     certbot-dns-do \
     certbot-dns-domeneshop \
+    certbot-dns-dreamhost \
     certbot-dns-duckdns \
-    certbot-dns-dynu \
+    certbot-dns-freedns \
     certbot-dns-gehirn \
+    certbot-dns-glesys \
     certbot-dns-godaddy \
     certbot-dns-google \
     certbot-dns-google-domains \
@@ -115,6 +118,7 @@ RUN \
     certbot-dns-linode \
     certbot-dns-loopia \
     certbot-dns-luadns \
+    certbot-dns-namecheap \
     certbot-dns-netcup \
     certbot-dns-njalla \
     certbot-dns-nsone \
@@ -140,6 +144,8 @@ RUN \
   sed -i \
     's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
     /defaults/nginx/ssl.conf.sample && \
+  echo "**** remove stream.conf ****" && \
+  rm -f /etc/nginx/conf.d/stream.conf && \
   echo "**** correct ip6tables legacy issue ****" && \
   rm \
     /sbin/ip6tables && \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
 
 # set version label
 ARG BUILD_DATE
@@ -45,39 +45,39 @@ RUN \
     nginx-mod-stream \
     nginx-mod-stream-geoip2 \
     nginx-vim \
-    php82-bcmath \
+    php83-bcmath \
-    php82-bz2 \
+    php83-bz2 \
-    php82-dom \
+    php83-dom \
-    php82-exif \
+    php83-exif \
-    php82-ftp \
+    php83-ftp \
-    php82-gd \
+    php83-gd \
-    php82-gmp \
+    php83-gmp \
-    php82-imap \
+    php83-imap \
-    php82-intl \
+    php83-intl \
-    php82-ldap \
+    php83-ldap \
-    php82-mysqli \
+    php83-mysqli \
-    php82-mysqlnd \
+    php83-mysqlnd \
-    php82-opcache \
+    php83-opcache \
-    php82-pdo_mysql \
+    php83-pdo_mysql \
-    php82-pdo_odbc \
+    php83-pdo_odbc \
-    php82-pdo_pgsql \
+    php83-pdo_pgsql \
-    php82-pdo_sqlite \
+    php83-pdo_sqlite \
-    php82-pear \
+    php83-pear \
-    php82-pecl-apcu \
+    php83-pecl-apcu \
-    php82-pecl-memcached \
+    php83-pecl-memcached \
-    php82-pecl-redis \
+    php83-pecl-redis \
-    php82-pgsql \
+    php83-pgsql \
-    php82-posix \
+    php83-posix \
-    php82-soap \
+    php83-soap \
-    php82-sockets \
+    php83-sockets \
-    php82-sodium \
+    php83-sodium \
-    php82-sqlite3 \
+    php83-sqlite3 \
-    php82-tokenizer \
+    php83-tokenizer \
-    php82-xmlreader \
+    php83-xmlreader \
-    php82-xsl \
+    php83-xsl \
     whois && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    php82-pecl-mcrypt && \
+    php83-pecl-mcrypt && \
   echo "**** install certbot plugins ****" && \
   if [ -z ${CERTBOT_VERSION+x} ]; then \
     CERTBOT_VERSION=$(curl -sL  https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
@@ -86,11 +86,12 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
     certbot==${CERTBOT_VERSION} \
     certbot-dns-acmedns \
     certbot-dns-aliyun \
     certbot-dns-azure \
+    certbot-dns-bunny \
     certbot-dns-cloudflare \
     certbot-dns-cpanel \
     certbot-dns-desec \
@@ -101,9 +102,11 @@ RUN \
     certbot-dns-dnspod \
     certbot-dns-do \
     certbot-dns-domeneshop \
+    certbot-dns-dreamhost \
     certbot-dns-duckdns \
-    certbot-dns-dynu \
+    certbot-dns-freedns \
     certbot-dns-gehirn \
+    certbot-dns-glesys \
     certbot-dns-godaddy \
     certbot-dns-google \
     certbot-dns-google-domains \
@@ -115,6 +118,7 @@ RUN \
     certbot-dns-linode \
     certbot-dns-loopia \
     certbot-dns-luadns \
+    certbot-dns-namecheap \
     certbot-dns-netcup \
     certbot-dns-njalla \
     certbot-dns-nsone \
@@ -140,6 +144,8 @@ RUN \
   sed -i \
     's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
     /defaults/nginx/ssl.conf.sample && \
+  echo "**** remove stream.conf ****" && \
+  rm -f /etc/nginx/conf.d/stream.conf && \
   echo "**** correct ip6tables legacy issue ****" && \
   rm \
     /sbin/ip6tables && \

Jenkinsfile

@@ -16,7 +16,7 @@ pipeline {
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
-    SCARF_TOKEN=credentials('scarf_api_key')
+    DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
     EXT_PIP = 'certbot'
     BUILD_VERSION_ARG = 'CERTBOT_VERSION'
     LS_USER = 'linuxserver'
@@ -60,11 +60,16 @@ pipeline {
           env.COMMIT_SHA = sh(
             script: '''git rev-parse HEAD''',
             returnStdout: true).trim()
+          env.GH_DEFAULT_BRANCH = sh(
+            script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''',
+            returnStdout: true).trim()
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
           env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
         }
+        sh '''#! /bin/bash
+              echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
         script{
           env.LS_RELEASE_NUMBER = sh(
             script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''',
@@ -121,7 +126,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE_CLEAN = sh(
-            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
+            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''',
             returnStdout: true).trim()
 
           def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
@@ -139,7 +144,7 @@ pipeline {
           }
 
           if (env.SEMVER != null) {
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+            if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") {
               env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
             }
             println("SEMVER: ${env.SEMVER}")
@@ -240,9 +245,11 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
+                    apk add --no-cache python3 && \
-                    pip install s3cmd && \
+                    python3 -m venv /lsiopy && \
+                    pip install --no-cache-dir -U pip && \
+                    pip install --no-cache-dir s3cmd && \
                     s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
         }
       }
@@ -261,8 +268,15 @@ pipeline {
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              # Cloned repo paths for templating:
-              # Stage 1 - Jenkinsfile update
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
+              # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
+              # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
+              git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest 
+              echo "Starting Stage 1 - Jenkinsfile update"
               if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
@@ -271,15 +285,16 @@ pipeline {
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 git add Jenkinsfile
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Updating Jenkinsfile"
+                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
                 echo "Jenkinsfile is up to date."
               fi
-              # Stage 2 - Delete old templates
+              echo "Starting Stage 2 - Delete old templates"
               OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
@@ -295,15 +310,16 @@ pipeline {
                   git rm "${i}"
                 done
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old and deprecated templates"
+                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
                 echo "No templates to delete"
               fi
-              # Stage 3 - Update templates
+              echo "Starting Stage 3 - Update templates"
               CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
               cd ${TEMPDIR}/docker-${CONTAINER_NAME}
               NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -324,19 +340,34 @@ pipeline {
                 fi
                 git add readme-vars.yml ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating templates and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
               else
                 echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "No templates to update"
               fi
-              mkdir -p ${TEMPDIR}/gitbook
+              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
+              mkdir -p ${TEMPDIR}/docs
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                cd ${TEMPDIR}/gitbook/docker-documentation/
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
-                git add images/docker-${CONTAINER_NAME}.md
+                cd ${TEMPDIR}/docs/docker-documentation
+                GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                git add docs/images/docker-${CONTAINER_NAME}.md
+                echo "Updating docs repo"
                 git commit -m 'Bot Updating Documentation'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH})
+              else
+                echo "Docs update not needed, skipping"
               fi
               mkdir -p ${TEMPDIR}/unraid
               git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
@@ -346,8 +377,10 @@ pipeline {
               elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
                 sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
               fi
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+                echo "Updating Unraid template"
                 cd ${TEMPDIR}/unraid/templates/
+                GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                   echo "Image is on the ignore list, marking Unraid template as deprecated"
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
@@ -359,7 +392,42 @@ pipeline {
                   git add unraid/${CONTAINER_NAME}.xml
                   git commit -m 'Bot Updating Unraid Template'
                 fi
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
+              else
+                echo "No updates to Unraid template needed, skipping"
+              fi
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
+                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then
+                  echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
+                else
+                  echo "Syncing readme to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
+                fi
+                if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then
+                  echo "Docker Hub endpoint doesn't exist. Creating endpoint first."
+                  DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                  curl -s \
+                    -H "Authorization: JWT ${DH_TOKEN}" \
+                    -H "Content-Type: application/json" \
+                    -X POST \
+                    -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \
+                    https://hub.docker.com/v2/repositories/ || :
+                fi
+                DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                curl -s \
+                  -H "Authorization: JWT ${DH_TOKEN}" \
+                  -H "Content-Type: application/json" \
+                  -X PATCH \
+                  -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
+                  https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
+              else
+                echo "Not the default Github branch. Skipping readme sync to Docker Hub."
               fi
               rm -Rf ${TEMPDIR}'''
         script{
@@ -415,43 +483,16 @@ pipeline {
       }
       steps{
         sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
-        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
+          -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
-             "name":"'${LS_REPO}'",
+            "name":"'${LS_REPO}'",
-             "mirror":true,\
+            "mirror":true,\
-             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+            "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
-             "issues_access_level":"disabled",\
+            "issues_access_level":"disabled",\
-             "merge_requests_access_level":"disabled",\
+            "merge_requests_access_level":"disabled",\
-             "repository_access_level":"enabled",\
+            "repository_access_level":"enabled",\
-             "visibility":"public"}' '''
+            "visibility":"public"}' '''
-      } 
+        sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
-    }
+          -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
-    /* #######################
-           Scarf.sh package registry
-       ####################### */
-    // Add package to Scarf.sh and set permissions
-    stage("Scarf.sh package registry"){
-      when {
-        branch "master"
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps{
-        sh '''#! /bin/bash
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/swag") | .uuid' || :)
-              if [ -z "${PACKAGE_UUID}" ]; then
-                echo "Adding package to Scarf.sh"
-                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
-                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
-                  -H "Content-Type: application/json" \
-                  -d '{"name":"linuxserver/swag",\
-                       "shortDescription":"example description",\
-                       "libraryType":"docker",\
-                       "website":"https://github.com/linuxserver/docker-swag",\
-                       "backendUrl":"https://ghcr.io/linuxserver/swag",\
-                       "publicUrl":"https://lscr.io/linuxserver/swag"}' || :
-              else
-                echo "Package already exists on Scarf.sh"
-              fi
-           '''
       } 
     }
     /* ###############
@@ -588,7 +629,8 @@ pipeline {
                 wait
                 git add package_versions.txt
                 git commit -m 'Bot Updating Package Versions'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                 echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Package tag updated, stopping build process"
               else
@@ -691,12 +733,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -707,7 +743,7 @@ pipeline {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -738,12 +774,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -754,7 +784,7 @@ pipeline {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -849,37 +879,39 @@ pipeline {
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
       }
     }
-    // Use helper container to sync the current README on master to the dockerhub endpoint
+    // Add protection to the release branch
-    stage('Sync-README') {
+    stage('Github-Release-Branch-Protection') {
       when {
+        branch "master"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        withCredentials([
+        echo "Setting up protection for release branch master"
-          [
+        sh '''#! /bin/bash
-            $class: 'UsernamePasswordMultiBinding',
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+          -d $(jq -c .  << EOF
-            usernameVariable: 'DOCKERUSER',
+            {
-            passwordVariable: 'DOCKERPASS'
+              "required_status_checks": null,
-          ]
+              "enforce_admins": false,
-        ]) {
+              "required_pull_request_reviews": {
-          sh '''#! /bin/bash
+                "dismiss_stale_reviews": false,
-                set -e
+                "require_code_owner_reviews": false,
-                TEMPDIR=$(mktemp -d)
+                "require_last_push_approval": false,
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+                "required_approving_review_count": 1
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
+              },
-                docker pull ghcr.io/linuxserver/readme-sync
+              "restrictions": null,
-                docker run --rm=true \
+              "required_linear_history": false,
-                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
+              "allow_force_pushes": false,
-                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
+              "allow_deletions": false,
-                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
+              "block_creations": false,
-                  -e DOCKER_REPOSITORY=${IMAGE} \
+              "required_conversation_resolution": true,
-                  -e GIT_BRANCH=master \
+              "lock_branch": false,
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
+              "allow_fork_syncing": false,
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
+              "required_signatures": false
-                rm -Rf ${TEMPDIR} '''
+            }
-        }
+EOF
+          ) '''
       }
     }
     // If this is a Pull request send the CI link as a comment on it

README.md

@@ -1,6 +1,5 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
+<!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read the https://github.com/linuxserver/docker-swag/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read https://github.com/linuxserver/docker-swag/blob/master/.github/CONTRIBUTING.md -->
-
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
@@ -46,7 +45,7 @@ SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relatio
 
 ## Supported Architectures
 
-We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
 Simply pulling `lscr.io/linuxserver/swag:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
@@ -68,13 +67,28 @@ The architectures supported by this image are:
 * For `dns` validation, make sure to enter your credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`
   * Cloudflare provides free accounts for managing dns and is very easy to use with this image. Make sure that it is set up for "dns only" instead of "dns + proxy"
   * Google dns plugin is meant to be used with "Google Cloud DNS", a paid enterprise product, and not for "Google Domains DNS"
-  * DuckDNS only supoprts two types of DNS validated certificates (not both at the same time):
+  * DuckDNS only supports two types of DNS validated certificates (not both at the same time):
     1. Certs that only cover your main subdomain (ie. `yoursubdomain.duckdns.org`, leave the `SUBDOMAINS` variable empty)
     2. Certs that cover sub-subdomains of your main subdomain (ie. `*.yoursubdomain.duckdns.org`, set the `SUBDOMAINS` variable to `wildcard`)
 * `--cap-add=NET_ADMIN` is required for fail2ban to modify iptables
 * After setup, navigate to `https://yourdomain.url` to access the default homepage (http access through port 80 is disabled by default, you can enable it by editing the default site config at `/config/nginx/site-confs/default.conf`).
 * Certs are checked nightly and if expiration is within 30 days, renewal is attempted. If your cert is about to expire in less than 30 days, check the logs under `/config/log/letsencrypt` to see why the renewals have been failing. It is recommended to input your e-mail in docker parameters so you receive expiration notices from Let's Encrypt in those circumstances.
 
+### Certbot Plugins
+
+SWAG includes many Certbot plugins out of the box, but not all plugins can be includes.
+If you need a plugin that is not included, the quickest way to have the plugin available is to use our [Universal Package Install Docker Mod](https://github.com/linuxserver/docker-mods/tree/universal-package-install).
+
+Set the following environment variables on your container:
+
+```yaml
+DOCKER_MODS=linuxserver/mods:universal-package-install
+INSTALL_PIP_PACKAGES=certbot-dns-<plugin>
+```
+
+Set the required credentials (usually found in the plugin documentation) in `/config/dns-conf/<plugin>.ini`.
+It is recommended to attempt obtaining a certificate with `STAGING=true` first to make sure the plugin is working as expected.
+
 ### Security and password protection
 
 * The container detects changes to url and subdomains, revokes existing certs and generates new ones during start.
@@ -138,13 +152,12 @@ Please follow the instructions [on this blog post](https://www.linuxserver.io/bl
 
 ## Usage
 
-Here are some example snippets to help you get started creating a container.
+To help you get started creating a container from this image you can either use docker-compose or the docker cli.
 
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 
 ```yaml
 ---
-version: "2.1"
 services:
   swag:
     image: lscr.io/linuxserver/swag:latest
@@ -166,7 +179,7 @@ services:
       - EXTRA_DOMAINS= #optional
       - STAGING=false #optional
     volumes:
-      - /path/to/appdata/config:/config
+      - /path/to/swag/config:/config
     ports:
       - 443:443
       - 80:80 #optional
@@ -194,15 +207,14 @@ docker run -d \
   -e STAGING=false `#optional` \
   -p 443:443 \
   -p 80:80 `#optional` \
-  -v /path/to/appdata/config:/config \
+  -v /path/to/swag/config:/config \
   --restart unless-stopped \
   lscr.io/linuxserver/swag:latest
-
 ```
 
 ## Parameters
 
-Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
+Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
 
 | Parameter | Function |
 | :----: | --- |
@@ -215,13 +227,13 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e VALIDATION=http` | Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set). |
 | `-e SUBDOMAINS=www,` | Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this *exactly* to `wildcard` (wildcard cert is available via `dns` validation only) |
 | `-e CERTPROVIDER=` | Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt. |
-| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `duckdns`, `dynu`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. |
+| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `freedns`, `gandi`, `gehirn`, `glesys`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. |
 | `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. |
 | `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). |
 | `-e ONLY_SUBDOMAINS=false` | If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true` |
 | `-e EXTRA_DOMAINS=` | Additional fully qualified domain names (comma separated, no spaces) ie. `extradomain.com,subdomain.anotherdomain.org,*.anotherdomain.org` |
 | `-e STAGING=false` | Set to `true` to retrieve certs in staging mode. Rate limits will be much higher, but the resulting cert will not pass the browser's security test. Only to be used for testing purposes. |
-| `-v /config` | All the config files including the webroot reside here. |
+| `-v /config` | Persistent config files |
 
 ### Portainer notice
 
@@ -234,10 +246,10 @@ You can set any environment variable from a file by using a special prepend `FIL
 As an example:
 
 ```bash
--e FILE__PASSWORD=/run/secrets/mysecretpassword
+-e FILE__MYVAR=/run/secrets/mysecretvariable
 ```
 
-Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file.
 
 ## Umask for running applications
 
@@ -246,15 +258,20 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu
 
 ## User / Group Identifiers
 
-When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
+When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
 
 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
 
-In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below:
 
 ```bash
-  $ id username
+id your_user
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+```
+
+Example output:
+
+```text
+uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
 ```
 
 ## Docker Mods
@@ -265,53 +282,100 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 
 ## Support Info
 
-* Shell access whilst the container is running: `docker exec -it swag /bin/bash`
+* Shell access whilst the container is running:
-* To monitor the logs of the container in realtime: `docker logs -f swag`
+
-* container version number
+    ```bash
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' swag`
+    docker exec -it swag /bin/bash
-* image version number
+    ```
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/swag:latest`
+
+* To monitor the logs of the container in realtime:
+
+    ```bash
+    docker logs -f swag
+    ```
+
+* Container version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' swag
+    ```
+
+* Image version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/swag:latest
+    ```
 
 ## Updating Info
 
-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
 
 Below are the instructions for updating containers:
 
 ### Via Docker Compose
 
-* Update all images: `docker-compose pull`
+* Update images:
-  * or update a single image: `docker-compose pull swag`
+    * All images:
-* Let compose update all containers as necessary: `docker-compose up -d`
+
-  * or update a single container: `docker-compose up -d swag`
+        ```bash
-* You can also remove the old dangling images: `docker image prune`
+        docker-compose pull
+        ```
+
+    * Single image:
+
+        ```bash
+        docker-compose pull swag
+        ```
+
+* Update containers:
+    * All containers:
+
+        ```bash
+        docker-compose up -d
+        ```
+
+    * Single container:
+
+        ```bash
+        docker-compose up -d swag
+        ```
+
+* You can also remove the old dangling images:
+
+    ```bash
+    docker image prune
+    ```
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/swag:latest`
+* Update the image:
-* Stop the running container: `docker stop swag`
+
-* Delete the container: `docker rm swag`
+    ```bash
+    docker pull lscr.io/linuxserver/swag:latest
+    ```
+
+* Stop the running container:
+
+    ```bash
+    docker stop swag
+    ```
+
+* Delete the container:
+
+    ```bash
+    docker rm swag
+    ```
+
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* You can also remove the old dangling images: `docker image prune`
+* You can also remove the old dangling images:
 
-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
+    ```bash
-
+    docker image prune
-* Pull the latest image at its tag and replace it with the same env variables in one run:
+    ```
-
-  ```bash
-  docker run --rm \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  containrrr/watchtower \
-  --run-once swag
-  ```
-
-* You can also remove the old dangling images: `docker image prune`
-
-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
-* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
 
 ## Building locally
 
@@ -336,6 +400,19 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **14.03.24:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf - Update Authelia conf samples with support for 4.38.
+* **06.03.24:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Cleanup default site conf.
+* **04.03.24:** - Remove `stream.conf` inside the container to allow users to include their own block in `nginx.conf`.
+* **23.01.24:** - Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate.
+* **01.01.24:** - Add GleSYS DNS plugin.
+* **11.12.23:** - Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins.
+* **30.11.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404.
+* **23.11.23:** - Run certbot as root to allow fix http validation.
+* **01.10.23:** - Fix "unrecognized arguments" issue in DirectAdmin DNS plugin.
+* **28.08.23:** - Add Namecheap DNS plugin.
+* **12.08.23:** - Add FreeDNS plugin. Detect certbot DNS authenticators using CLI.
+* **07.08.23:** - Add Bunny DNS Configuration.
+* **27.07.23:** - Added support for dreamhost validation.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **27.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf, authentik-location.conf, authentik-server.conf - Simplify auth configs and fix Set-Cookie header bug.
 * **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.

package_versions.txt

@@ -1,340 +1,346 @@
-NAME                            VERSION                 TYPE   
+NAME                            VERSION                TYPE                    
-ConfigArgParse                  1.5.5                   python  
+ConfigArgParse                  1.7                    python                   
-PyJWT                           2.7.0                   python  
+PyJWT                           2.8.0                  python                   
-PyYAML                          6.0                     python  
+PyNamecheap                     0.0.3                  python                   
-acme                            2.6.0                   python  
+PyYAML                          6.0.1                  python                   
-alpine-baselayout               3.4.3-r1                apk     
+Simple Launcher                 1.1.0.14               dotnet  (+5 duplicates)  
-alpine-baselayout-data          3.4.3-r1                apk     
+acme                            2.9.0                  python                   
-alpine-keys                     2.4-r1                  apk     
+alpine-baselayout               3.4.3-r2               apk                      
-alpine-release                  3.18.2-r0               apk     
+alpine-baselayout-data          3.4.3-r2               apk                      
-aom-libs                        3.6.1-r0                apk     
+alpine-keys                     2.4-r1                 apk                      
-apache2-utils                   2.4.57-r2               apk     
+alpine-release                  3.19.1-r0              apk                      
-apk-tools                       2.14.0-r2               apk     
+aom-libs                        3.7.1-r0               apk                      
-apr                             1.7.4-r0                apk     
+apache2-utils                   2.4.58-r1              apk                      
-apr-util                        1.6.3-r1                apk     
+apk-tools                       2.14.0-r5              apk                      
-argon2-libs                     20190702-r4             apk     
+apr                             1.7.4-r0               apk                      
-attrs                           23.1.0                  python  
+apr-util                        1.6.3-r1               apk                      
-azure-common                    1.1.28                  python  
+argon2-libs                     20190702-r5            apk                      
-azure-core                      1.27.1                  python  
+attrs                           23.2.0                 python                   
-azure-identity                  1.13.0                  python  
+azure-common                    1.1.28                 python                   
-azure-mgmt-core                 1.4.0                   python  
+azure-core                      1.30.1                 python                   
-azure-mgmt-dns                  8.1.0                   python  
+azure-identity                  1.15.0                 python                   
-bash                            5.2.15-r5               apk     
+azure-mgmt-core                 1.4.0                  python                   
-beautifulsoup4                  4.12.2                  python  
+azure-mgmt-dns                  8.1.0                  python                   
-boto3                           1.26.165                python  
+bash                            5.2.21-r0              apk                      
-botocore                        1.29.165                python  
+beautifulsoup4                  4.12.3                 python                   
-brotli-libs                     1.0.9-r14               apk     
+boto3                           1.34.64                python                   
-bs4                             0.0.1                   python  
+botocore                        1.34.64                python                   
-busybox                         1.36.1                  binary  
+brotli-libs                     1.1.0-r1               apk                      
-busybox                         1.36.1-r0               apk     
+bs4                             0.0.2                  python                   
-busybox-binsh                   1.36.1-r0               apk     
+busybox                         1.36.1-r15             apk                      
-c-client                        2007f-r15               apk     
+busybox-binsh                   1.36.1-r15             apk                      
-ca-certificates                 20230506-r0             apk     
+c-ares                          1.24.0-r1              apk                      
-ca-certificates-bundle          20230506-r0             apk     
+c-client                        2007f-r15              apk                      
-cachetools                      5.3.1                   python  
+ca-certificates                 20230506-r0            apk                      
-certbot                         2.6.0                   python  
+ca-certificates-bundle          20230506-r0            apk                      
-certbot-dns-acmedns             0.1.0                   python  
+cachetools                      5.3.3                  python                   
-certbot-dns-aliyun              2.0.0                   python  
+certbot                         2.9.0                  python                   
-certbot-dns-azure               2.3.0                   python  
+certbot-dns-acmedns             0.1.0                  python                   
-certbot-dns-cloudflare          2.6.0                   python  
+certbot-dns-aliyun              2.0.0                  python                   
-certbot-dns-cpanel              0.4.0                   python  
+certbot-dns-azure               2.4.0                  python                   
-certbot-dns-desec               1.2.1                   python  
+certbot-dns-bunny               0.0.9                  python                   
-certbot-dns-digitalocean        2.6.0                   python  
+certbot-dns-cloudflare          2.9.0                  python                   
-certbot-dns-directadmin         1.0.3                   python  
+certbot-dns-cpanel              0.4.0                  python                   
-certbot-dns-dnsimple            2.6.0                   python  
+certbot-dns-desec               1.2.1                  python                   
-certbot-dns-dnsmadeeasy         2.6.0                   python  
+certbot-dns-digitalocean        2.9.0                  python                   
-certbot-dns-dnspod              0.1.0                   python  
+certbot-dns-directadmin         1.0.4                  python                   
-certbot-dns-do                  0.31.0                  python  
+certbot-dns-dnsimple            2.9.0                  python                   
-certbot-dns-domeneshop          0.2.9                   python  
+certbot-dns-dnsmadeeasy         2.9.0                  python                   
-certbot-dns-duckdns             1.3                     python  
+certbot-dns-dnspod              0.1.0                  python                   
-certbot-dns-dynu                0.0.4                   python  
+certbot-dns-do                  0.31.0                 python                   
-certbot-dns-gehirn              2.6.0                   python  
+certbot-dns-domeneshop          0.2.9                  python                   
-certbot-dns-godaddy             0.2.2                   python  
+certbot-dns-dreamhost           1.0                    python                   
-certbot-dns-google              2.6.0                   python  
+certbot-dns-duckdns             1.3                    python                   
-certbot-dns-google-domains      0.1.11                  python  
+certbot-dns-freedns             0.1.0                  python                   
-certbot-dns-he                  1.0.0                   python  
+certbot-dns-gehirn              2.9.0                  python                   
-certbot-dns-hetzner             2.0.0                   python  
+certbot-dns-glesys              2.1.0                  python                   
-certbot-dns-infomaniak          0.2.1                   python  
+certbot-dns-godaddy             2.8.0                  python                   
-certbot-dns-inwx                2.2.0                   python  
+certbot-dns-google              2.9.0                  python                   
-certbot-dns-ionos               2022.11.24              python  
+certbot-dns-google-domains      0.1.11                 python                   
-certbot-dns-linode              2.6.0                   python  
+certbot-dns-he                  1.0.0                  python                   
-certbot-dns-loopia              1.0.1                   python  
+certbot-dns-hetzner             2.0.0                  python                   
-certbot-dns-luadns              2.6.0                   python  
+certbot-dns-infomaniak          0.2.2                  python                   
-certbot-dns-netcup              1.3.0                   python  
+certbot-dns-inwx                2.2.0                  python                   
-certbot-dns-njalla              1.0.0                   python  
+certbot-dns-ionos               2024.1.8               python                   
-certbot-dns-nsone               2.6.0                   python  
+certbot-dns-linode              2.9.0                  python                   
-certbot-dns-ovh                 2.6.0                   python  
+certbot-dns-loopia              1.0.1                  python                   
-certbot-dns-porkbun             0.8                     python  
+certbot-dns-luadns              2.9.0                  python                   
-certbot-dns-rfc2136             2.6.0                   python  
+certbot-dns-namecheap           1.0.0                  python                   
-certbot-dns-route53             2.6.0                   python  
+certbot-dns-netcup              1.4.3                  python                   
-certbot-dns-sakuracloud         2.6.0                   python  
+certbot-dns-njalla              1.0.0                  python                   
-certbot-dns-standalone          1.1                     python  
+certbot-dns-nsone               2.9.0                  python                   
-certbot-dns-transip             0.5.2                   python  
+certbot-dns-ovh                 2.9.0                  python                   
-certbot-dns-vultr               1.1.0                   python  
+certbot-dns-porkbun             0.8                    python                   
-certbot-plugin-gandi            1.4.3                   python  
+certbot-dns-rfc2136             2.9.0                  python                   
-certifi                         2023.5.7                python  
+certbot-dns-route53             2.9.0                  python                   
-cffi                            1.15.1                  python  
+certbot-dns-sakuracloud         2.9.0                  python                   
-charset-normalizer              3.1.0                   python  
+certbot-dns-standalone          1.1                    python                   
-cloudflare                      2.11.6                  python  
+certbot-dns-transip             0.5.2                  python                   
-configobj                       5.0.8                   python  
+certbot-dns-vultr               1.1.0                  python                   
-coreutils                       9.3-r1                  apk     
+certbot-plugin-gandi            1.5.0                  python                   
-cryptography                    41.0.1                  python  
+certifi                         2024.2.2               python                   
-curl                            8.1.2-r0                apk     
+cffi                            1.16.0                 python                   
-dataclasses-json                0.5.9                   python  
+charset-normalizer              3.3.2                  python                   
-distro                          1.8.0                   python  
+cloudflare                      2.19.2                 python                   
-dns-lexicon                     3.11.7                  python  
+composer                        2.7.2                  binary                   
-dnslib                          0.9.23                  python  
+configobj                       5.0.8                  python                   
-dnspython                       2.3.0                   python  
+coreutils                       9.4-r2                 apk                      
-domeneshop                      0.4.3                   python  
+coreutils-env                   9.4-r2                 apk                      
-fail2ban                        1.0.2                   python  
+coreutils-fmt                   9.4-r2                 apk                      
-fail2ban                        1.0.2-r2                apk     
+coreutils-sha512sum             9.4-r2                 apk                      
-fail2ban-pyc                    1.0.2-r2                apk     
+cryptography                    42.0.5                 python                   
-filelock                        3.12.2                  python  
+curl                            8.5.0-r0               apk                      
-fontconfig                      2.14.2-r3               apk     
+dataclasses-json                0.5.14                 python                   
-freetype                        2.13.0-r5               apk     
+distro                          1.9.0                  python                   
-future                          0.18.3                  python  
+dns-lexicon                     3.17.0                 python                   
-gdbm                            1.23-r1                 apk     
+dnslib                          0.9.24                 python                   
-git                             2.40.1-r0               apk     
+dnspython                       2.6.1                  python                   
-git-perl                        2.40.1-r0               apk     
+domeneshop                      0.4.3                  python                   
-gmp                             6.2.1-r3                apk     
+fail2ban                        1.0.2                  python                   
-gnupg                           2.4.1-r1                apk     
+fail2ban                        1.0.2-r3               apk                      
-gnupg-dirmngr                   2.4.1-r1                apk     
+fail2ban-pyc                    1.0.2-r3               apk                      
-gnupg-gpgconf                   2.4.1-r1                apk     
+filelock                        3.13.1                 python                   
-gnupg-keyboxd                   2.4.1-r1                apk     
+fontconfig                      2.14.2-r4              apk                      
-gnupg-utils                     2.4.1-r1                apk     
+freetype                        2.13.2-r0              apk                      
-gnupg-wks-client                2.4.1-r1                apk     
+future                          1.0.0                  python                   
-gnutls                          3.8.0-r2                apk     
+gdbm                            1.23-r1                apk                      
-google-api-core                 2.11.1                  python  
+git                             2.43.0-r0              apk                      
-google-api-python-client        2.91.0                  python  
+git-perl                        2.43.0-r0              apk                      
-google-auth                     2.21.0                  python  
+gmp                             6.3.0-r0               apk                      
-google-auth-httplib2            0.1.0                   python  
+gnupg                           2.4.4-r0               apk                      
-googleapis-common-protos        1.59.1                  python  
+gnupg-dirmngr                   2.4.4-r0               apk                      
-gpg                             2.4.1-r1                apk     
+gnupg-gpgconf                   2.4.4-r0               apk                      
-gpg-agent                       2.4.1-r1                apk     
+gnupg-keyboxd                   2.4.4-r0               apk                      
-gpg-wks-server                  2.4.1-r1                apk     
+gnupg-utils                     2.4.4-r0               apk                      
-gpgsm                           2.4.1-r1                apk     
+gnupg-wks-client                2.4.4-r0               apk                      
-gpgv                            2.4.1-r1                apk     
+gnutls                          3.8.3-r0               apk                      
-httplib2                        0.22.0                  python  
+google-api-core                 2.17.1                 python                   
-icu-data-en                     73.2-r1                 apk     
+google-api-python-client        2.122.0                python                   
-icu-libs                        73.2-r1                 apk     
+google-auth                     2.28.2                 python                   
-idna                            3.4                     python  
+google-auth-httplib2            0.2.0                  python                   
-importlib-metadata              6.7.0                   python  
+googleapis-common-protos        1.63.0                 python                   
-ip6tables                       1.8.9-r2                apk     
+gpg                             2.4.4-r0               apk                      
-iptables                        1.8.9-r2                apk     
+gpg-agent                       2.4.4-r0               apk                      
-isodate                         0.6.1                   python  
+gpg-wks-server                  2.4.4-r0               apk                      
-jmespath                        1.0.1                   python  
+gpgsm                           2.4.4-r0               apk                      
-josepy                          1.13.0                  python  
+gpgv                            2.4.4-r0               apk                      
-jq                              1.6-r3                  apk     
+hiredis                         1.2.0-r0               apk                      
-jsonlines                       3.1.0                   python  
+httplib2                        0.22.0                 python                   
-jsonpickle                      3.0.1                   python  
+icu-data-en                     74.1-r0                apk                      
-libacl                          2.3.1-r3                apk     
+icu-libs                        74.1-r0                apk                      
-libassuan                       2.5.6-r0                apk     
+idna                            3.6                    python                   
-libattr                         2.5.1-r4                apk     
+iptables                        1.8.10-r3              apk                      
-libavif                         0.11.1-r2               apk     
+isodate                         0.6.1                  python                   
-libbsd                          0.11.7-r1               apk     
+jmespath                        1.0.1                  python                   
-libbz2                          1.0.8-r5                apk     
+josepy                          1.14.0                 python                   
-libc-utils                      0.7.2-r5                apk     
+jq                              1.7.1-r0               apk                      
-libcrypto3                      3.1.1-r1                apk     
+jsonlines                       4.0.0                  python                   
-libcurl                         8.1.2-r0                apk     
+jsonpickle                      3.0.3                  python                   
-libdav1d                        1.2.1-r0                apk     
+libacl                          2.3.1-r4               apk                      
-libedit                         20221030.3.1-r1         apk     
+libassuan                       2.5.6-r1               apk                      
-libevent                        2.1.12-r6               apk     
+libattr                         2.5.1-r5               apk                      
-libexpat                        2.5.0-r1                apk     
+libavif                         1.0.3-r0               apk                      
-libffi                          3.4.4-r2                apk     
+libbsd                          0.11.7-r3              apk                      
-libgcc                          12.2.1_git20220924-r10  apk     
+libbz2                          1.0.8-r6               apk                      
-libgcrypt                       1.10.2-r1               apk     
+libc-utils                      0.7.2-r5               apk                      
-libgd                           2.3.3-r7                apk     
+libcrypto3                      3.1.4-r5               apk                      
-libgpg-error                    1.47-r1                 apk     
+libcurl                         8.5.0-r0               apk                      
-libice                          1.1.1-r2                apk     
+libdav1d                        1.3.0-r1               apk                      
-libidn2                         2.3.4-r1                apk     
+libedit                         20230828.3.1-r3        apk                      
-libintl                         0.21.1-r7               apk     
+libevent                        2.1.12-r7              apk                      
-libjpeg-turbo                   2.1.5.1-r3              apk     
+libexpat                        2.6.0-r0               apk                      
-libksba                         1.6.4-r0                apk     
+libffi                          3.4.4-r3               apk                      
-libldap                         2.6.4-r3                apk     
+libgcc                          13.2.1_git20231014-r0  apk                      
-libmaxminddb-libs               1.7.1-r1                apk     
+libgcrypt                       1.10.3-r0              apk                      
-libmcrypt                       2.5.8-r10               apk     
+libgd                           2.3.3-r8               apk                      
-libmd                           1.0.4-r2                apk     
+libgpg-error                    1.47-r2                apk                      
-libmemcached-libs               1.1.4-r1                apk     
+libice                          1.1.1-r5               apk                      
-libmnl                          1.0.5-r1                apk     
+libidn2                         2.3.4-r4               apk                      
-libncursesw                     6.4_p20230506-r0        apk     
+libintl                         0.22.3-r0              apk                      
-libnftnl                        1.2.5-r1                apk     
+libjpeg-turbo                   3.0.1-r0               apk                      
-libpanelw                       6.4_p20230506-r0        apk     
+libksba                         1.6.5-r0               apk                      
-libpng                          1.6.39-r3               apk     
+libldap                         2.6.6-r1               apk                      
-libpq                           15.3-r0                 apk     
+libmaxminddb-libs               1.7.1-r2               apk                      
-libproc2                        4.0.3-r1                apk     
+libmcrypt                       2.5.8-r10              apk                      
-libsasl                         2.1.28-r4               apk     
+libmd                           1.1.0-r0               apk                      
-libseccomp                      2.5.4-r2                apk     
+libmemcached-libs               1.1.4-r1               apk                      
-libsm                           1.2.4-r1                apk     
+libmnl                          1.0.5-r2               apk                      
-libsodium                       1.0.18-r3               apk     
+libncursesw                     6.4_p20231125-r0       apk                      
-libssl3                         3.1.1-r1                apk     
+libnftnl                        1.2.6-r0               apk                      
-libstdc++                       12.2.1_git20220924-r10  apk     
+libpanelw                       6.4_p20231125-r0       apk                      
-libtasn1                        4.19.0-r1               apk     
+libpng                          1.6.40-r0              apk                      
-libunistring                    1.1-r1                  apk     
+libpq                           16.2-r0                apk                      
-libuuid                         2.38.1-r8               apk     
+libproc2                        4.0.4-r0               apk                      
-libwebp                         1.3.1-r0                apk     
+libsasl                         2.1.28-r5              apk                      
-libx11                          1.8.4-r4                apk     
+libseccomp                      2.5.5-r0               apk                      
-libxau                          1.0.11-r2               apk     
+libsharpyuv                     1.3.2-r0               apk                      
-libxcb                          1.15-r1                 apk     
+libsm                           1.2.4-r3               apk                      
-libxdmcp                        1.1.4-r2                apk     
+libsodium                       1.0.19-r0              apk                      
-libxext                         1.3.5-r2                apk     
+libssl3                         3.1.4-r5               apk                      
-libxml2                         2.11.4-r0               apk     
+libstdc++                       13.2.1_git20231014-r0  apk                      
-libxpm                          3.5.16-r1               apk     
+libtasn1                        4.19.0-r2              apk                      
-libxslt                         1.1.38-r0               apk     
+libunistring                    1.1-r2                 apk                      
-libxt                           1.3.0-r2                apk     
+libuuid                         2.39.3-r0              apk                      
-libzip                          1.9.2-r2                apk     
+libwebp                         1.3.2-r0               apk                      
-linux-pam                       1.5.2-r10               apk     
+libx11                          1.8.7-r0               apk                      
-logrotate                       3.21.0-r1               apk     
+libxau                          1.0.11-r3              apk                      
-loopialib                       0.2.0                   python  
+libxcb                          1.16-r0                apk                      
-lxml                            4.9.2                   python  
+libxdmcp                        1.1.4-r3               apk                      
-lz4-libs                        1.9.4-r4                apk     
+libxext                         1.3.5-r3               apk                      
-marshmallow                     3.19.0                  python  
+libxml2                         2.11.7-r0              apk                      
-marshmallow-enum                1.5.1                   python  
+libxpm                          3.5.17-r0              apk                      
-memcached                       1.6.21                  binary  
+libxslt                         1.1.39-r0              apk                      
-memcached                       1.6.21-r0               apk     
+libxt                           1.3.0-r4               apk                      
-mock                            5.0.2                   python  
+libxtables                      1.8.10-r3              apk                      
-mpdecimal                       2.5.1-r2                apk     
+libzip                          1.10.1-r0              apk                      
-msal                            1.22.0                  python  
+linux-pam                       1.5.3-r7               apk                      
-msal-extensions                 1.0.0                   python  
+logrotate                       3.21.0-r1              apk                      
-musl                            1.2.4-r0                apk     
+loopialib                       0.2.0                  python                   
-musl-utils                      1.2.4-r0                apk     
+lxml                            5.1.0                  python                   
-mypy-extensions                 1.0.0                   python  
+lz4-libs                        1.9.4-r5               apk                      
-nano                            7.2-r1                  apk     
+marshmallow                     3.21.1                 python                   
-ncurses-terminfo-base           6.4_p20230506-r0        apk     
+memcached                       1.6.22-r0              apk                      
-netcat-openbsd                  1.219-r1                apk     
+mock                            5.1.0                  python                   
-nettle                          3.8.1-r2                apk     
+mpdecimal                       2.5.1-r2               apk                      
-nghttp2-libs                    1.53.0-r0               apk     
+msal                            1.27.0                 python                   
-nginx                           1.24.0-r6               apk     
+msal-extensions                 1.1.0                  python                   
-nginx-mod-devel-kit             1.24.0-r6               apk     
+musl                            1.2.4_git20230717-r4   apk                      
-nginx-mod-http-brotli           1.24.0-r6               apk     
+musl-utils                      1.2.4_git20230717-r4   apk                      
-nginx-mod-http-dav-ext          1.24.0-r6               apk     
+mypy-extensions                 1.0.0                  python                   
-nginx-mod-http-echo             1.24.0-r6               apk     
+nano                            7.2-r1                 apk                      
-nginx-mod-http-fancyindex       1.24.0-r6               apk     
+ncurses-terminfo-base           6.4_p20231125-r0       apk                      
-nginx-mod-http-geoip2           1.24.0-r6               apk     
+netcat-openbsd                  1.226-r0               apk                      
-nginx-mod-http-headers-more     1.24.0-r6               apk     
+nettle                          3.9.1-r0               apk                      
-nginx-mod-http-image-filter     1.24.0-r6               apk     
+nghttp2-libs                    1.58.0-r0              apk                      
-nginx-mod-http-perl             1.24.0-r6               apk     
+nginx                           1.24.0-r15             apk                      
-nginx-mod-http-redis2           1.24.0-r6               apk     
+nginx-mod-devel-kit             1.24.0-r15             apk                      
-nginx-mod-http-set-misc         1.24.0-r6               apk     
+nginx-mod-http-brotli           1.24.0-r15             apk                      
-nginx-mod-http-upload-progress  1.24.0-r6               apk     
+nginx-mod-http-dav-ext          1.24.0-r15             apk                      
-nginx-mod-http-xslt-filter      1.24.0-r6               apk     
+nginx-mod-http-echo             1.24.0-r15             apk                      
-nginx-mod-mail                  1.24.0-r6               apk     
+nginx-mod-http-fancyindex       1.24.0-r15             apk                      
-nginx-mod-rtmp                  1.24.0-r6               apk     
+nginx-mod-http-geoip2           1.24.0-r15             apk                      
-nginx-mod-stream                1.24.0-r6               apk     
+nginx-mod-http-headers-more     1.24.0-r15             apk                      
-nginx-mod-stream-geoip2         1.24.0-r6               apk     
+nginx-mod-http-image-filter     1.24.0-r15             apk                      
-nginx-vim                       1.24.0-r6               apk     
+nginx-mod-http-perl             1.24.0-r15             apk                      
-npth                            1.6-r4                  apk     
+nginx-mod-http-redis2           1.24.0-r15             apk                      
-oniguruma                       6.9.8-r1                apk     
+nginx-mod-http-set-misc         1.24.0-r15             apk                      
-openssl                         3.1.1-r1                apk     
+nginx-mod-http-upload-progress  1.24.0-r15             apk                      
-p11-kit                         0.24.1-r2               apk     
+nginx-mod-http-xslt-filter      1.24.0-r15             apk                      
-packaging                       23.1                    python  
+nginx-mod-mail                  1.24.0-r15             apk                      
-parsedatetime                   2.6                     python  
+nginx-mod-rtmp                  1.24.0-r15             apk                      
-pcre                            8.45-r3                 apk     
+nginx-mod-stream                1.24.0-r15             apk                      
-pcre2                           10.42-r1                apk     
+nginx-mod-stream-geoip2         1.24.0-r15             apk                      
-perl                            5.36.1-r2               apk     
+nginx-vim                       1.24.0-r15             apk                      
-perl-error                      0.17029-r1              apk     
+npth                            1.6-r4                 apk                      
-perl-git                        2.40.1-r0               apk     
+oniguruma                       6.9.9-r0               apk                      
-php-cli                         8.2.7                   binary  
+openssl                         3.1.4-r5               apk                      
-php-fpm                         8.2.7                   binary  
+p11-kit                         0.25.3-r0              apk                      
-php82                           8.2.7-r0                apk     
+packaging                       24.0                   python                   
-php82-bcmath                    8.2.7-r0                apk     
+parsedatetime                   2.6                    python                   
-php82-bz2                       8.2.7-r0                apk     
+pcre                            8.45-r3                apk                      
-php82-common                    8.2.7-r0                apk     
+pcre2                           10.42-r2               apk                      
-php82-ctype                     8.2.7-r0                apk     
+perl                            5.38.2-r0              apk                      
-php82-curl                      8.2.7-r0                apk     
+perl-error                      0.17029-r2             apk                      
-php82-dom                       8.2.7-r0                apk     
+perl-git                        2.43.0-r0              apk                      
-php82-exif                      8.2.7-r0                apk     
+php83                           8.3.4-r0               apk                      
-php82-fileinfo                  8.2.7-r0                apk     
+php83-bcmath                    8.3.4-r0               apk                      
-php82-fpm                       8.2.7-r0                apk     
+php83-bz2                       8.3.4-r0               apk                      
-php82-ftp                       8.2.7-r0                apk     
+php83-common                    8.3.4-r0               apk                      
-php82-gd                        8.2.7-r0                apk     
+php83-ctype                     8.3.4-r0               apk                      
-php82-gmp                       8.2.7-r0                apk     
+php83-curl                      8.3.4-r0               apk                      
-php82-iconv                     8.2.7-r0                apk     
+php83-dom                       8.3.4-r0               apk                      
-php82-imap                      8.2.7-r0                apk     
+php83-exif                      8.3.4-r0               apk                      
-php82-intl                      8.2.7-r0                apk     
+php83-fileinfo                  8.3.4-r0               apk                      
-php82-ldap                      8.2.7-r0                apk     
+php83-fpm                       8.3.4-r0               apk                      
-php82-mbstring                  8.2.7-r0                apk     
+php83-ftp                       8.3.4-r0               apk                      
-php82-mysqli                    8.2.7-r0                apk     
+php83-gd                        8.3.4-r0               apk                      
-php82-mysqlnd                   8.2.7-r0                apk     
+php83-gmp                       8.3.4-r0               apk                      
-php82-opcache                   8.2.7-r0                apk     
+php83-iconv                     8.3.4-r0               apk                      
-php82-openssl                   8.2.7-r0                apk     
+php83-imap                      8.3.4-r0               apk                      
-php82-pdo                       8.2.7-r0                apk     
+php83-intl                      8.3.4-r0               apk                      
-php82-pdo_mysql                 8.2.7-r0                apk     
+php83-ldap                      8.3.4-r0               apk                      
-php82-pdo_odbc                  8.2.7-r0                apk     
+php83-mbstring                  8.3.4-r0               apk                      
-php82-pdo_pgsql                 8.2.7-r0                apk     
+php83-mysqli                    8.3.4-r0               apk                      
-php82-pdo_sqlite                8.2.7-r0                apk     
+php83-mysqlnd                   8.3.4-r0               apk                      
-php82-pear                      8.2.7-r0                apk     
+php83-opcache                   8.3.4-r0               apk                      
-php82-pecl-apcu                 5.1.22-r0               apk     
+php83-openssl                   8.3.4-r0               apk                      
-php82-pecl-igbinary             3.2.14-r0               apk     
+php83-pdo                       8.3.4-r0               apk                      
-php82-pecl-mcrypt               1.0.6-r0                apk     
+php83-pdo_mysql                 8.3.4-r0               apk                      
-php82-pecl-memcached            3.2.0-r1                apk     
+php83-pdo_odbc                  8.3.4-r0               apk                      
-php82-pecl-msgpack              2.2.0-r0                apk     
+php83-pdo_pgsql                 8.3.4-r0               apk                      
-php82-pecl-redis                5.3.7-r2                apk     
+php83-pdo_sqlite                8.3.4-r0               apk                      
-php82-pgsql                     8.2.7-r0                apk     
+php83-pear                      8.3.4-r0               apk                      
-php82-phar                      8.2.7-r0                apk     
+php83-pecl-apcu                 5.1.23-r0              apk                      
-php82-posix                     8.2.7-r0                apk     
+php83-pecl-igbinary             3.2.15-r0              apk                      
-php82-session                   8.2.7-r0                apk     
+php83-pecl-mcrypt               1.0.7-r0               apk                      
-php82-simplexml                 8.2.7-r0                apk     
+php83-pecl-memcached            3.2.0-r0               apk                      
-php82-soap                      8.2.7-r0                apk     
+php83-pecl-msgpack              2.2.0-r1               apk                      
-php82-sockets                   8.2.7-r0                apk     
+php83-pecl-redis                6.0.2-r0               apk                      
-php82-sodium                    8.2.7-r0                apk     
+php83-pgsql                     8.3.4-r0               apk                      
-php82-sqlite3                   8.2.7-r0                apk     
+php83-phar                      8.3.4-r0               apk                      
-php82-tokenizer                 8.2.7-r0                apk     
+php83-posix                     8.3.4-r0               apk                      
-php82-xml                       8.2.7-r0                apk     
+php83-session                   8.3.4-r0               apk                      
-php82-xmlreader                 8.2.7-r0                apk     
+php83-simplexml                 8.3.4-r0               apk                      
-php82-xmlwriter                 8.2.7-r0                apk     
+php83-soap                      8.3.4-r0               apk                      
-php82-xsl                       8.2.7-r0                apk     
+php83-sockets                   8.3.4-r0               apk                      
-php82-zip                       8.2.7-r0                apk     
+php83-sodium                    8.3.4-r0               apk                      
-pinentry                        1.2.1-r1                apk     
+php83-sqlite3                   8.3.4-r0               apk                      
-pip                             23.1.2                  python  
+php83-tokenizer                 8.3.4-r0               apk                      
-pkb-client                      1.2                     python  
+php83-xml                       8.3.4-r0               apk                      
-popt                            1.19-r2                 apk     
+php83-xmlreader                 8.3.4-r0               apk                      
-portalocker                     2.7.0                   python  
+php83-xmlwriter                 8.3.4-r0               apk                      
-procps-ng                       4.0.3-r1                apk     
+php83-xsl                       8.3.4-r0               apk                      
-protobuf                        4.23.3                  python  
+php83-zip                       8.3.4-r0               apk                      
-publicsuffixlist                0.9.4                   python  
+pinentry                        1.2.1-r1               apk                      
-pyOpenSSL                       23.2.0                  python  
+pip                             24.0                   python                   
-pyRFC3339                       1.1                     python  
+pkb-client                      1.2                    python                   
-pyacmedns                       0.4                     python  
+popt                            1.19-r3                apk                      
-pyasn1                          0.5.0                   python  
+portalocker                     2.8.2                  python                   
-pyasn1-modules                  0.3.0                   python  
+procps-ng                       4.0.4-r0               apk                      
-pyc                             0.1-r0                  apk     
+protobuf                        4.25.3                 python                   
-pycparser                       2.21                    python  
+publicsuffixlist                0.9.4                  python                   
-pyparsing                       3.1.0                   python  
+pyOpenSSL                       24.1.0                 python                   
-python                          3.11.4                  binary  
+pyRFC3339                       1.1                    python                   
-python-dateutil                 2.8.2                   python  
+pyacmedns                       0.4                    python                   
-python-digitalocean             1.17.0                  python  
+pyasn1                          0.5.1                  python                   
-python-transip                  0.6.0                   python  
+pyasn1-modules                  0.3.0                  python                   
-python3                         3.11.4-r0               apk     
+pyc                             3.11.8-r0              apk                      
-python3-pyc                     3.11.4-r0               apk     
+pycparser                       2.21                   python                   
-python3-pycache-pyc0            3.11.4-r0               apk     
+pyotp                           2.9.0                  python                   
-pytz                            2023.3                  python  
+pyparsing                       3.1.2                  python                   
-readline                        8.2.1-r1                apk     
+python-dateutil                 2.9.0.post0            python                   
-requests                        2.31.0                  python  
+python-digitalocean             1.17.0                 python                   
-requests-file                   1.5.1                   python  
+python-transip                  0.6.0                  python                   
-requests-mock                   1.11.0                  python  
+python3                         3.11.8-r0              apk                      
-rsa                             4.9                     python  
+python3-pyc                     3.11.8-r0              apk                      
-s3transfer                      0.6.1                   python  
+python3-pycache-pyc0            3.11.8-r0              apk                      
-scanelf                         1.3.7-r1                apk     
+pytz                            2024.1                 python                   
-setuptools                      65.5.0                  python  
+readline                        8.2.1-r2               apk                      
-shadow                          4.13-r4                 apk     
+requests                        2.31.0                 python                   
-six                             1.16.0                  python  
+requests-file                   2.0.0                  python                   
-skalibs                         2.13.1.1-r1             apk     
+requests-mock                   1.11.0                 python                   
-soupsieve                       2.4.1                   python  
+rsa                             4.9                    python                   
-sqlite-libs                     3.41.2-r2               apk     
+s3transfer                      0.10.1                 python                   
-ssl_client                      1.36.1-r0               apk     
+scanelf                         1.3.7-r2               apk                      
-tiff                            4.5.1-r0                apk     
+setuptools                      65.5.0                 python                   
-tldextract                      3.4.4                   python  
+shadow                          4.14.2-r0              apk                      
-typing-inspect                  0.9.0                   python  
+six                             1.16.0                 python                   
-typing_extensions               4.7.0                   python  
+skalibs                         2.14.0.1-r0            apk                      
-tzdata                          2023c-r1                apk     
+soupsieve                       2.5                    python                   
-unixodbc                        2.3.11-r2               apk     
+sqlite-libs                     3.44.2-r0              apk                      
-uritemplate                     4.1.1                   python  
+ssl_client                      1.36.1-r15             apk                      
-urllib3                         1.26.16                 python  
+tiff                            4.6.0-r0               apk                      
-utmps-libs                      0.1.2.1-r1              apk     
+tldextract                      5.1.1                  python                   
-wheel                           0.40.0                  python  
+typing-inspect                  0.9.0                  python                   
-whois                           5.5.17-r0               apk     
+typing_extensions               4.10.0                 python                   
-xz-libs                         5.4.3-r0                apk     
+tzdata                          2024a-r0               apk                      
-zipp                            3.15.0                  python  
+unixodbc                        2.3.12-r0              apk                      
-zlib                            1.2.13-r1               apk     
+uritemplate                     4.1.1                  python                   
-zope.interface                  6.0                     python  
+urllib3                         2.2.1                  python                   
-zstd-libs                       1.5.5-r4                apk     
+utmps-libs                      0.1.2.2-r0             apk                      
+wheel                           0.43.0                 python                   
+whois                           5.5.20-r0              apk                      
+xz-libs                         5.4.5-r0               apk                      
+zlib                            1.3.1-r0               apk                      
+zope.interface                  6.2                    python                   
+zstd-libs                       1.5.5-r8               apk                      

readme-vars.yml

@@ -34,7 +34,7 @@ param_env_vars:
   - { env_var: "VALIDATION", env_value: "http", desc: "Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set)." }
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "All the config files including the webroot reside here." }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "443", internal_port: "443", port_desc: "Https port" }
@@ -50,7 +50,7 @@ opt_param_usage_include_env: true
 opt_param_env_vars:
   - { env_var: "SUBDOMAINS", env_value: "www,", desc: "Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this *exactly* to `wildcard` (wildcard cert is available via `dns` validation only)" }
   - { env_var: "CERTPROVIDER", env_value: "", desc: "Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt." }
-  - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `duckdns`, `dynu`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
+  - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `freedns`, `gandi`, `gehirn`, `glesys`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
   - { env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." }
   - { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." }
   - { env_var: "ONLY_SUBDOMAINS", env_value: "false", desc: "If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true`" }
@@ -58,7 +58,7 @@ opt_param_env_vars:
   - { env_var: "STAGING", env_value: "false", desc: "Set to `true` to retrieve certs in staging mode. Rate limits will be much higher, but the resulting cert will not pass the browser's security test. Only to be used for testing purposes." }
 opt_param_usage_include_vols: false
 opt_param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Configuration files." }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
 opt_param_usage_include_ports: true
 opt_param_ports:
   - { external_port: "80", internal_port: "80", port_desc: "Http port (required for http validation and http -> https redirect)" }
@@ -83,13 +83,28 @@ app_setup_block: |
   * For `dns` validation, make sure to enter your credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`
     * Cloudflare provides free accounts for managing dns and is very easy to use with this image. Make sure that it is set up for "dns only" instead of "dns + proxy"
     * Google dns plugin is meant to be used with "Google Cloud DNS", a paid enterprise product, and not for "Google Domains DNS"
-    * DuckDNS only supoprts two types of DNS validated certificates (not both at the same time):
+    * DuckDNS only supports two types of DNS validated certificates (not both at the same time):
       1. Certs that only cover your main subdomain (ie. `yoursubdomain.duckdns.org`, leave the `SUBDOMAINS` variable empty)
       2. Certs that cover sub-subdomains of your main subdomain (ie. `*.yoursubdomain.duckdns.org`, set the `SUBDOMAINS` variable to `wildcard`)
   * `--cap-add=NET_ADMIN` is required for fail2ban to modify iptables
   * After setup, navigate to `https://yourdomain.url` to access the default homepage (http access through port 80 is disabled by default, you can enable it by editing the default site config at `/config/nginx/site-confs/default.conf`).
   * Certs are checked nightly and if expiration is within 30 days, renewal is attempted. If your cert is about to expire in less than 30 days, check the logs under `/config/log/letsencrypt` to see why the renewals have been failing. It is recommended to input your e-mail in docker parameters so you receive expiration notices from Let's Encrypt in those circumstances.
 
+  ### Certbot Plugins
+
+  SWAG includes many Certbot plugins out of the box, but not all plugins can be includes.
+  If you need a plugin that is not included, the quickest way to have the plugin available is to use our [Universal Package Install Docker Mod](https://github.com/linuxserver/docker-mods/tree/universal-package-install).
+
+  Set the following environment variables on your container:
+
+  ```yaml
+  DOCKER_MODS=linuxserver/mods:universal-package-install
+  INSTALL_PIP_PACKAGES=certbot-dns-<plugin>
+  ```
+
+  Set the required credentials (usually found in the plugin documentation) in `/config/dns-conf/<plugin>.ini`.
+  It is recommended to attempt obtaining a certificate with `STAGING=true` first to make sure the plugin is working as expected.
+
   ### Security and password protection
 
   * The container detects changes to url and subdomains, revokes existing certs and generates new ones during start.
@@ -153,6 +168,19 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "14.03.24:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf - Update Authelia conf samples with support for 4.38." }
+  - { date: "06.03.24:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Cleanup default site conf." }
+  - { date: "04.03.24:", desc: "Remove `stream.conf` inside the container to allow users to include their own block in `nginx.conf`." }
+  - { date: "23.01.24:", desc: "Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate." }
+  - { date: "01.01.24:", desc: "Add GleSYS DNS plugin." }
+  - { date: "11.12.23:", desc: "Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins." }
+  - { date: "30.11.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404." }
+  - { date: "23.11.23:", desc: "Run certbot as root to allow fix http validation." }
+  - { date: "01.10.23:", desc: "Fix \"unrecognized arguments\" issue in DirectAdmin DNS plugin." }
+  - { date: "28.08.23:", desc: "Add Namecheap DNS plugin." }
+  - { date: "12.08.23:", desc: "Add FreeDNS plugin. Detect certbot DNS authenticators using CLI." }
+  - { date: "07.08.23:", desc: "Add Bunny DNS Configuration." }
+  - { date: "27.07.23:", desc: "Added support for dreamhost validation." }
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
   - { date: "27.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf, authentik-location.conf, authentik-server.conf - Simplify auth configs and fix Set-Cookie header bug." }
   - { 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." }

root/defaults/dns-conf/bunny.ini

@@ -0,0 +1,2 @@
+# Bunny API token used by Certbot
+dns_bunny_api_key = a65e8ebd-45ab-44d2-a542-40d4d009e3bf

root/defaults/dns-conf/dreamhost.ini

@@ -0,0 +1,4 @@
+# Instructions: https://github.com/goncalo-leal/certbot-dns-dreamhost#usage
+# Replace with your values
+dns_dreamhost_baseurl = "https://api.dreamhost.com/"
+dns_dreamhost_api_key = "<api_key>"

root/defaults/dns-conf/dynu.ini

@@ -1,3 +0,0 @@
-# Instructions: https://github.com/bikram990/certbot-dns-dynu#configuration
-# Replace with your API token from your dynu account.
-dns_dynu_auth_token = AbCbASsd!@34

root/defaults/dns-conf/freedns.ini

@@ -0,0 +1,4 @@
+# Instructions: https://github.com/schleuss/certbot_dns_freedns#credentials
+# Replace with your values
+dns_freedns_username = myremoteuser
+dns_freedns_password = verysecureremoteuserpassword

root/defaults/dns-conf/glesys.ini

@@ -0,0 +1,5 @@
+# Instructions: https://github.com/runfalk/certbot-dns-glesys#usage
+
+# GleSYS API credentials used by Certbot
+dns_glesys_user = CL00000
+dns_glesys_password = apikeygoeshere

root/defaults/dns-conf/namecheap.ini

@@ -0,0 +1,4 @@
+# Instructions: https://github.com/knoxell/certbot-dns-namecheap#credentials
+# Namecheap API credentials used by Certbot
+dns_namecheap_username=my-username
+dns_namecheap_api_key=my-api-key

root/defaults/fail2ban/filter.d/nginx-deny.conf

@@ -12,4 +12,4 @@ datepattern = {^LN-BEG}
 
 # DEV NOTES:
 #
-# Author: Will L (driz@linuxserver.io)
+# Author: notdriz

root/defaults/nginx/authelia-location.conf.sample

@@ -1,10 +1,15 @@
-## Version 2023/04/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-location.conf.sample
+## Version 2024/03/14 - 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
 # 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
+# For authelia 4.37 and below, make sure that the authelia configuration.yml has 'path: "authelia"' defined
+# For authelia 4.38 and above, make sure that the authelia configuration.yml has 'address: "tcp://:9091/authelia"' defined
 
 ## Send a subrequest to Authelia to verify if the user is authenticated and has permission to access the resource
-auth_request /authelia/api/verify;
+## For authelia 4.37 and below, use the following line
+# auth_request /authelia/api/verify;
+## For authelia 4.38 and above, use the following line
+auth_request /authelia/api/authz/auth-request;
+
 ## If the subreqest returns 200 pass to the backend, if the subrequest returns 401 redirect to the portal
 error_page 401 = @authelia_proxy_signin;
 

root/defaults/nginx/authelia-server.conf.sample

@@ -1,18 +1,20 @@
-## Version 2023/04/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-server.conf.sample
+## Version 2024/03/16 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-server.conf.sample
 # 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
-# Make sure that the authelia configuration.yml has 'path: "authelia"' defined
+# For authelia 4.37 and below, make sure that the authelia configuration.yml has 'path: "authelia"' defined
+# For authelia 4.38 and above, make sure that the authelia configuration.yml has 'address: "tcp://:9091/authelia"' defined
 
 # location for authelia subfolder requests
 location ^~ /authelia {
     auth_request off; # requests to this subfolder must be accessible without authentication
+
     include /config/nginx/proxy.conf;
     include /config/nginx/resolver.conf;
     set $upstream_authelia authelia;
     proxy_pass http://$upstream_authelia:9091;
 }
 
-# location for authelia auth requests
+# location for authelia 4.37 and below auth requests
 location = /authelia/api/verify {
     internal;
 
@@ -29,6 +31,23 @@ location = /authelia/api/verify {
     proxy_set_header Content-Length "";
 }
 
+# location for authelia 4.38 and above auth requests
+location = /authelia/api/authz/auth-request {
+    internal;
+
+    include /config/nginx/proxy.conf;
+    include /config/nginx/resolver.conf;
+    set $upstream_authelia authelia;
+    proxy_pass http://$upstream_authelia:9091;
+
+    ## Include the Set-Cookie header if present
+    auth_request_set $set_cookie $upstream_http_set_cookie;
+    add_header Set-Cookie $set_cookie;
+
+    proxy_pass_request_body off;
+    proxy_set_header Content-Length "";
+}
+
 # virtual location for authelia 401 redirects
 location @authelia_proxy_signin {
     internal;

root/defaults/nginx/authentik-location.conf.sample

@@ -4,6 +4,7 @@
 
 ## Send a subrequest to Authentik to verify if the user is authenticated and has permission to access the resource
 auth_request /outpost.goauthentik.io/auth/nginx;
+
 ## If the subreqest returns 200 pass to the backend, if the subrequest returns 401 redirect to the portal
 error_page 401 = @goauthentik_proxy_signin;
 

root/defaults/nginx/authentik-server.conf.sample

@@ -5,6 +5,7 @@
 # location for authentik subfolder requests
 location ^~ /outpost.goauthentik.io {
     auth_request off; # requests to this subfolder must be accessible without authentication
+
     include /config/nginx/proxy.conf;
     include /config/nginx/resolver.conf;
     set $upstream_authentik authentik-server;

root/defaults/nginx/site-confs/default.conf.sample

@@ -1,4 +1,4 @@
-## Version 2023/06/05 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/03/06 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
 
 # redirect all traffic to https
 server {
@@ -48,7 +48,7 @@ server {
         # enable for Authentik (requires authentik-server.conf in the server block)
         #include /config/nginx/authentik-location.conf;
 
-        try_files $uri $uri/ /index.html /index.php$is_args$args =404;
+        try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args;
     }
 
     location ~ ^(.+\.php)(.*)$ {
@@ -66,6 +66,7 @@ server {
         #include /config/nginx/authentik-location.conf;
 
         fastcgi_split_path_info ^(.+\.php)(.*)$;
+        if (!-f $document_root$fastcgi_script_name) { return 404; }
         fastcgi_pass 127.0.0.1:9000;
         fastcgi_index index.php;
         include /etc/nginx/fastcgi_params;

root/etc/crontabs/root

@@ -1,9 +1,8 @@
-# do daily/weekly/monthly maintenance
 # min   hour    day     month   weekday command
 */15    *       *       *       *       run-parts /etc/periodic/15min
 0       *       *       *       *       run-parts /etc/periodic/hourly
 0       2       *       *       *       run-parts /etc/periodic/daily
 0       3       *       *       6       run-parts /etc/periodic/weekly
 0       5       1       *       *       run-parts /etc/periodic/monthly
-# renew letsencrypt certs
+
 8       2       *       *       *       /app/le-renew.sh >> /config/log/letsencrypt/letsencrypt.log 2>&1

root/etc/s6-overlay/s6-rc.d/init-certbot-config/run

@@ -23,12 +23,45 @@ for i in "${SANED_VARS[@]}"; do
     export echo "${i}"="$(echo "${!i}" | tr '[:upper:]' '[:lower:]')"
 done
 
+# Check for and install requested DNS plugins
+if grep -q "universal-package-install" <<< "${DOCKER_MODS}" && grep -q "certbot-dns" <<< "${INSTALL_PIP_PACKAGES}"; then
+    echo "**** Installing requested dns plugins ****"
+    /etc/s6-overlay/s6-rc.d/init-mod-universal-package-install-add-package/run
+    /etc/s6-overlay/s6-rc.d/init-mods-package-install/run
+fi
+
 # check to make sure DNSPLUGIN is selected if dns validation is used
-if [[ "${VALIDATION}" = "dns" ]] && [[ ! "${DNSPLUGIN}" =~ ^(acmedns|aliyun|azure|cloudflare|cpanel|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|do|domeneshop|duckdns|dynu|gandi|gehirn|godaddy|google|google-domains|he|hetzner|infomaniak|inwx|ionos|linode|loopia|luadns|netcup|njalla|nsone|ovh|porkbun|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]]; then
+CERTBOT_DNS_AUTHENTICATORS=$(certbot plugins --authenticators 2>/dev/null | sed -e 's/^Entry point: EntryPoint(name='\''cpanel'\''/Entry point: EntryPoint(name='\''dns-cpanel'\''/' -e '/EntryPoint(name='\''dns-/!d' -e 's/^Entry point: EntryPoint(name='\''dns-\([^ ]*\)'\'',/\1/' | sort)
-    echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details."
+if [[ "${VALIDATION}" = "dns" ]] && ! echo "${CERTBOT_DNS_AUTHENTICATORS}" | grep -q "${DNSPLUGIN}"; then
+    echo "Please set the DNSPLUGIN variable to one of the following:"
+    echo "${CERTBOT_DNS_AUTHENTICATORS}"
     sleep infinity
 fi
 
+# set owner of certbot's CONFIG_DIR, WORK_DIR, and LOGS_DIR to abc
+lsiown -R abc:abc \
+    /etc/letsencrypt \
+    /var/lib/letsencrypt \
+    /var/log/letsencrypt
+
+# set_ini_value logic:
+# - if the name is not found in the file, append the name=value to the end of the file
+# - if the name is found in the file, replace the value
+# - if the name is found in the file but commented out, uncomment the line and replace the value
+# call set_ini_value with parameters: $1=name $2=value $3=file
+function set_ini_value() {
+    name=${1//\//\\/}
+    value=${2//\//\\/}
+    sed -i \
+        -e '/^#\?\(\s*'"${name}"'\s*=\s*\).*/{s//\1'"${value}"'/;:a;n;ba;q}' \
+        -e '$a'"${name}"'='"${value}" "${3}"
+}
+
+# ensure config files exist and has at least one value set (set_ini_value does not work on empty files)
+touch /config/etc/letsencrypt/cli.ini
+lsiown abc:abc /config/etc/letsencrypt/cli.ini
+grep -qF 'agree-tos' /config/etc/letsencrypt/cli.ini || echo 'agree-tos=true' >>/config/etc/letsencrypt/cli.ini
+
 # copy dns default configs
 cp -n /defaults/dns-conf/* /config/dns-conf/ 2> >(grep -v 'cp: not replacing')
 lsiown -R abc:abc /config/dns-conf
@@ -157,21 +190,25 @@ if [[ ! "${URL}" = "${ORIGURL}" ]] ||
     [[ ! "${CERTPROVIDER}" = "${ORIGCERTPROVIDER}" ]]; then
     echo "Different validation parameters entered than what was used before. Revoking and deleting existing certificate, and an updated one will be created"
     if [[ "${ORIGCERTPROVIDER}" = "zerossl" ]] && [[ -n "${ORIGEMAIL}" ]]; then
-        REV_EAB_CREDS=$(curl -s https://api.zerossl.com/acme/eab-credentials-email --data "email=${ORIGEMAIL}")
+        REV_ACMESERVER=("https://acme.zerossl.com/v2/DV90")
-        REV_ZEROSSL_EAB_KID=$(echo "${REV_EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_kid'])")
+        REV_ZEROSSL_EAB_KID=$(awk -F "=" '/eab-kid/ {print $2}' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" | tr -d ' ')
-        REV_ZEROSSL_EAB_HMAC_KEY=$(echo "${REV_EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_hmac_key'])")
+        REV_ZEROSSL_EAB_HMAC_KEY=$(awk -F "=" '/eab-hmac-key/ {print $2}' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" | tr -d ' ')
         if [[ -z "${REV_ZEROSSL_EAB_KID}" ]] || [[ -z "${REV_ZEROSSL_EAB_HMAC_KEY}" ]]; then
-            echo "Unable to retrieve EAB credentials from ZeroSSL. Check the outgoing connections to api.zerossl.com and dns. Sleeping."
+            REV_ZEROSSL_EAB_KID=$(awk -F "=" '/eab-kid/ {print $2}' /config/etc/letsencrypt/cli.ini | tr -d ' ')
-            sleep infinity
+            REV_ZEROSSL_EAB_HMAC_KEY=$(awk -F "=" '/eab-hmac-key/ {print $2}' /config/etc/letsencrypt/cli.ini | tr -d ' ')
+        fi
+        if [[ -n "${REV_ZEROSSL_EAB_KID}" ]] && [[ -n "${REV_ZEROSSL_EAB_HMAC_KEY}" ]]; then
+            REV_ACMESERVER+=("--eab-kid" "${REV_ZEROSSL_EAB_KID}" "--eab-hmac-key" "${REV_ZEROSSL_EAB_HMAC_KEY}")
         fi
-        REV_ACMESERVER="https://acme.zerossl.com/v2/DV90 --eab-kid ${REV_ZEROSSL_EAB_KID} --eab-hmac-key ${REV_ZEROSSL_EAB_HMAC_KEY}"
     elif [[ "${ORIGSTAGING}" = "true" ]]; then
-        REV_ACMESERVER="https://acme-staging-v02.api.letsencrypt.org/directory"
+        REV_ACMESERVER=("https://acme-staging-v02.api.letsencrypt.org/directory")
     else
-        REV_ACMESERVER="https://acme-v02.api.letsencrypt.org/directory"
+        REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory")
     fi
     if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
-        certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server ${REV_ACMESERVER} || true
+        certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true
+    else
+        certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
     fi
     rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal}
 fi
@@ -182,9 +219,11 @@ echo -e "ORIGURL=\"${URL}\" ORIGSUBDOMAINS=\"${SUBDOMAINS}\" ORIGONLY_SUBDOMAINS
 # Check if the cert is using the old LE root cert, revoke and regen if necessary
 if [[ -f "/config/keys/letsencrypt/chain.pem" ]] && { [[ "${CERTPROVIDER}" == "letsencrypt" ]] || [[ "${CERTPROVIDER}" == "" ]]; } && [[ "${STAGING}" != "true" ]] && ! openssl x509 -in /config/keys/letsencrypt/chain.pem -noout -issuer | grep -q "ISRG Root X"; then
     echo "The cert seems to be using the old LE root cert, which is no longer valid. Deleting and revoking."
-    REV_ACMESERVER="https://acme-v02.api.letsencrypt.org/directory"
+    REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory")
     if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
-        certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server ${REV_ACMESERVER} || true
+        certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true
+    else
+        certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
     fi
     rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal}
 fi
@@ -208,52 +247,51 @@ else
     ACMESERVER="https://acme-v02.api.letsencrypt.org/directory"
 fi
 
-# figuring out url only vs url & subdomains vs subdomains only
+set_ini_value "server" "${ACMESERVER}" /config/etc/letsencrypt/cli.ini
+
+# figuring out domain only vs domain & subdomains vs subdomains only
+DOMAINS_ARRAY=()
+if [[ -z "${SUBDOMAINS}" ]] || [[ "${ONLY_SUBDOMAINS}" != true ]]; then
+    DOMAINS_ARRAY+=("${URL}")
+fi
 if [[ -n "${SUBDOMAINS}" ]]; then
     echo "SUBDOMAINS entered, processing"
+    SUBDOMAINS_ARRAY=()
     if [[ "${SUBDOMAINS}" = "wildcard" ]]; then
-        if [[ "${ONLY_SUBDOMAINS}" = true ]]; then
+        SUBDOMAINS_ARRAY+=("*.${URL}")
-            export URL_REAL="-d *.${URL}"
+        echo "Wildcard cert for ${URL} will be requested"
-            echo "Wildcard cert for only the subdomains of ${URL} will be requested"
-        else
-            export URL_REAL="-d *.${URL} -d ${URL}"
-            echo "Wildcard cert for ${URL} will be requested"
-        fi
     else
-        echo "SUBDOMAINS entered, processing"
         for job in $(echo "${SUBDOMAINS}" | tr "," " "); do
-            export SUBDOMAINS_REAL="${SUBDOMAINS_REAL} -d ${job}.${URL}"
+            SUBDOMAINS_ARRAY+=("${job}.${URL}")
         done
-        if [[ "${ONLY_SUBDOMAINS}" = true ]]; then
+        echo "Sub-domains processed are: $(echo "${SUBDOMAINS_ARRAY[*]}" | tr " " ",")"
-            URL_REAL="${SUBDOMAINS_REAL}"
-            echo "Only subdomains, no URL in cert"
-        else
-            URL_REAL="-d ${URL}${SUBDOMAINS_REAL}"
-        fi
-        echo "Sub-domains processed are: ${SUBDOMAINS_REAL}"
     fi
-else
+    DOMAINS_ARRAY+=("${SUBDOMAINS_ARRAY[@]}")
-    echo "No subdomains defined"
-    URL_REAL="-d ${URL}"
 fi
 
 # add extra domains
 if [[ -n "${EXTRA_DOMAINS}" ]]; then
     echo "EXTRA_DOMAINS entered, processing"
+    EXTRA_DOMAINS_ARRAY=()
     for job in $(echo "${EXTRA_DOMAINS}" | tr "," " "); do
-        export EXTRA_DOMAINS_REAL="${EXTRA_DOMAINS_REAL} -d ${job}"
+        EXTRA_DOMAINS_ARRAY+=("${job}")
     done
-    echo "Extra domains processed are: ${EXTRA_DOMAINS_REAL}"
+    echo "Extra domains processed are: $(echo "${EXTRA_DOMAINS_ARRAY[*]}" | tr " " ",")"
-    URL_REAL="${URL_REAL} ${EXTRA_DOMAINS_REAL}"
+    DOMAINS_ARRAY+=("${EXTRA_DOMAINS_ARRAY[@]}")
 fi
 
+# setting domains in cli.ini
+set_ini_value "domains" "$(echo "${DOMAINS_ARRAY[*]}" | tr " " ",")" /config/etc/letsencrypt/cli.ini
+
 # figuring out whether to use e-mail and which
 if [[ ${EMAIL} == *@* ]]; then
     echo "E-mail address entered: ${EMAIL}"
-    EMAILPARAM="-m ${EMAIL} --no-eff-email"
+    set_ini_value "email" "${EMAIL}" /config/etc/letsencrypt/cli.ini
+    set_ini_value "no-eff-email" "true" /config/etc/letsencrypt/cli.ini
+    set_ini_value "register-unsafely-without-email" "false" /config/etc/letsencrypt/cli.ini
 else
     echo "No e-mail address entered or address invalid"
-    EMAILPARAM="--register-unsafely-without-email"
+    set_ini_value "register-unsafely-without-email" "true" /config/etc/letsencrypt/cli.ini
 fi
 
 # alter extension for error message
@@ -265,37 +303,41 @@ fi
 
 # setting the validation method to use
 if [[ "${VALIDATION}" = "dns" ]]; then
-    AUTHENTICATORPARAM="--authenticator dns-${DNSPLUGIN}"
+    set_ini_value "preferred-challenges" "dns" /config/etc/letsencrypt/cli.ini
-    DNSCREDENTIALSPARAM="--dns-${DNSPLUGIN}-credentials ${DNSCREDENTIALFILE}"
+    set_ini_value "authenticator" "dns-${DNSPLUGIN}" /config/etc/letsencrypt/cli.ini
-    if [[ -n "${PROPAGATION}" ]]; then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
+    set_ini_value "dns-${DNSPLUGIN}-credentials" "${DNSCREDENTIALFILE}" /config/etc/letsencrypt/cli.ini
+    if [[ -n "${PROPAGATION}" ]]; then set_ini_value "dns-${DNSPLUGIN}-propagation-seconds" "${PROPAGATION}" /config/etc/letsencrypt/cli.ini; fi
 
     # plugins that don't support setting credentials file
     if [[ "${DNSPLUGIN}" =~ ^(route53|standalone)$ ]]; then
-        DNSCREDENTIALSPARAM=""
+        sed -i "/^dns-${DNSPLUGIN}-credentials\b/d" /config/etc/letsencrypt/cli.ini
     fi
     # plugins that don't support setting propagation
     if [[ "${DNSPLUGIN}" =~ ^(azure|gandi|route53|standalone)$ ]]; then
         if [[ -n "${PROPAGATION}" ]]; then echo "${DNSPLUGIN} dns plugin does not support setting propagation time"; fi
-        PROPAGATIONPARAM=""
+        sed -i "/^dns-${DNSPLUGIN}-propagation-seconds\b/d" /config/etc/letsencrypt/cli.ini
     fi
     # plugins that use old parameter naming convention
     if [[ "${DNSPLUGIN}" =~ ^(cpanel)$ ]]; then
-        AUTHENTICATORPARAM="--authenticator ${DNSPLUGIN}"
+        sed -i "/^dns-${DNSPLUGIN}-credentials\b/d" /config/etc/letsencrypt/cli.ini
-        DNSCREDENTIALSPARAM="--${DNSPLUGIN}-credentials ${DNSCREDENTIALFILE}"
+        sed -i "/^dns-${DNSPLUGIN}-propagation-seconds\b/d" /config/etc/letsencrypt/cli.ini
-        if [[ -n "${PROPAGATION}" ]]; then PROPAGATIONPARAM="--${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
+        set_ini_value "authenticator" "${DNSPLUGIN}" /config/etc/letsencrypt/cli.ini
+        set_ini_value "${DNSPLUGIN}-credentials" "${DNSCREDENTIALFILE}" /config/etc/letsencrypt/cli.ini
+        if [[ -n "${PROPAGATION}" ]]; then set_ini_value "${DNSPLUGIN}-propagation-seconds" "${PROPAGATION}" /config/etc/letsencrypt/cli.ini; fi
     fi
     # don't restore txt records when using DuckDNS plugin
     if [[ "${DNSPLUGIN}" =~ ^(duckdns)$ ]]; then
-        AUTHENTICATORPARAM="${AUTHENTICATORPARAM} --dns-${DNSPLUGIN}-no-txt-restore"
+        set_ini_value "dns-${DNSPLUGIN}-no-txt-restore" "true" /config/etc/letsencrypt/cli.ini
     fi
 
-    PREFCHAL="${AUTHENTICATORPARAM} ${DNSCREDENTIALSPARAM} ${PROPAGATIONPARAM}"
     echo "${VALIDATION} validation via ${DNSPLUGIN} plugin is selected"
 elif [[ "${VALIDATION}" = "tls-sni" ]]; then
-    PREFCHAL="--standalone --preferred-challenges http"
+    set_ini_value "preferred-challenges" "http" /config/etc/letsencrypt/cli.ini
+    set_ini_value "authenticator" "standalone" /config/etc/letsencrypt/cli.ini
     echo "*****tls-sni validation has been deprecated, attempting http validation instead"
 else
-    PREFCHAL="--standalone --preferred-challenges http"
+    set_ini_value "preferred-challenges" "http" /config/etc/letsencrypt/cli.ini
+    set_ini_value "authenticator" "standalone" /config/etc/letsencrypt/cli.ini
     echo "http validation is selected"
 fi
 
@@ -304,17 +346,17 @@ if [[ ! -f "/config/keys/letsencrypt/fullchain.pem" ]]; then
     if [[ "${CERTPROVIDER}" = "zerossl" ]] && [[ -n "${EMAIL}" ]]; then
         echo "Retrieving EAB from ZeroSSL"
         EAB_CREDS=$(curl -s https://api.zerossl.com/acme/eab-credentials-email --data "email=${EMAIL}")
-        ZEROSSL_EAB_KID=$(echo "${EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_kid'])")
+        ZEROSSL_EAB_KID=$(echo "${EAB_CREDS}" | jq .eab_kid)
-        ZEROSSL_EAB_HMAC_KEY=$(echo "${EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_hmac_key'])")
+        ZEROSSL_EAB_HMAC_KEY=$(echo "${EAB_CREDS}" | jq .eab_hmac_key)
         if [[ -z "${ZEROSSL_EAB_KID}" ]] || [[ -z "${ZEROSSL_EAB_HMAC_KEY}" ]]; then
             echo "Unable to retrieve EAB credentials from ZeroSSL. Check the outgoing connections to api.zerossl.com and dns. Sleeping."
             sleep infinity
         fi
-        ZEROSSL_EAB="--eab-kid ${ZEROSSL_EAB_KID} --eab-hmac-key ${ZEROSSL_EAB_HMAC_KEY}"
+        set_ini_value "eab-kid" "${ZEROSSL_EAB_KID}" /config/etc/letsencrypt/cli.ini
+        set_ini_value "eab-hmac-key" "${ZEROSSL_EAB_HMAC_KEY}" /config/etc/letsencrypt/cli.ini
     fi
     echo "Generating new certificate"
-    # shellcheck disable=SC2086
+    certbot certonly --non-interactive --renew-by-default
-    certbot certonly --non-interactive --renew-by-default --server ${ACMESERVER} ${ZEROSSL_EAB} ${PREFCHAL} --rsa-key-size 4096 ${EMAILPARAM} --agree-tos ${URL_REAL}
     if [[ ! -d /config/keys/letsencrypt ]]; then
         if [[ "${VALIDATION}" = "dns" ]]; then
             echo "ERROR: Cert does not exist! Please see the validation error above. Make sure you entered correct credentials into the ${DNSCREDENTIALFILE} file."

root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run

@@ -1,38 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# make folders
-mkdir -p \
-    /config/crontabs
-
-## root
-# if crontabs do not exist in config
-if [[ ! -f /config/crontabs/root ]]; then
-    # copy crontab from system
-    if crontab -l -u root; then
-        crontab -l -u root >/config/crontabs/root
-    fi
-
-    # 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/ 2> >(grep -v 'cp: not replacing')
-fi
-# set permissions and import user crontabs
-lsiown root:root /config/crontabs/root
-crontab -u root /config/crontabs/root
-
-## abc
-# if crontabs do not exist in config
-if [[ ! -f /config/crontabs/abc ]]; then
-    # copy crontab from system
-    if crontab -l -u abc; then
-        crontab -l -u abc >/config/crontabs/abc
-    fi
-
-    # 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/ 2> >(grep -v 'cp: not replacing')
-fi
-# set permissions and import user crontabs
-lsiown abc:abc /config/crontabs/abc
-crontab -u abc /config/crontabs/abc

root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type

@@ -1 +0,0 @@
-oneshot

root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-crontabs-config/run

root/etc/s6-overlay/s6-rc.d/init-folders-config/run

@@ -3,7 +3,7 @@
 
 # make our folders and links
 mkdir -p \
-    /config/{fail2ban,crontabs,dns-conf} \
+    /config/{fail2ban,dns-conf} \
     /config/etc/letsencrypt/renewal-hooks \
     /config/log/{fail2ban,letsencrypt,nginx} \
     /config/nginx/proxy-confs \