Bot Updating Package Versions

2026-03-03 00:43:34 +09:00 · 2024-02-08 21:18:13 +00:00 · 2024-02-03 03:21:47 +00:00 · 2024-01-27 18:57:53 +00:00 · 2024-01-27 12:52:12 -06:00 · 2024-01-27 03:17:21 +00:00
24 changed files with 885 additions and 736 deletions
--- a/72
+++ b/72
@@ -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 \
-    php82-bz2 \
-    php82-dom \
-    php82-exif \
-    php82-ftp \
-    php82-gd \
-    php82-gmp \
-    php82-imap \
-    php82-intl \
-    php82-ldap \
-    php82-mysqli \
-    php82-mysqlnd \
-    php82-opcache \
-    php82-pdo_mysql \
-    php82-pdo_odbc \
-    php82-pdo_pgsql \
-    php82-pdo_sqlite \
-    php82-pear \
-    php82-pecl-apcu \
-    php82-pecl-memcached \
-    php82-pecl-redis \
-    php82-pgsql \
-    php82-posix \
-    php82-soap \
-    php82-sockets \
-    php82-sodium \
-    php82-sqlite3 \
-    php82-tokenizer \
-    php82-xmlreader \
-    php82-xsl \
+    php83-bcmath \
+    php83-bz2 \
+    php83-dom \
+    php83-exif \
+    php83-ftp \
+    php83-gd \
+    php83-gmp \
+    php83-imap \
+    php83-intl \
+    php83-ldap \
+    php83-mysqli \
+    php83-mysqlnd \
+    php83-opcache \
+    php83-pdo_mysql \
+    php83-pdo_odbc \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pear \
+    php83-pecl-apcu \
+    php83-pecl-memcached \
+    php83-pecl-redis \
+    php83-pgsql \
+    php83-posix \
+    php83-soap \
+    php83-sockets \
+    php83-sodium \
+    php83-sqlite3 \
+    php83-tokenizer \
+    php83-xmlreader \
+    php83-xsl \
    whois && \
  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    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 \
--- a/Dockerfile.aarch64
+++ b/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 \
-    php82-bz2 \
-    php82-dom \
-    php82-exif \
-    php82-ftp \
-    php82-gd \
-    php82-gmp \
-    php82-imap \
-    php82-intl \
-    php82-ldap \
-    php82-mysqli \
-    php82-mysqlnd \
-    php82-opcache \
-    php82-pdo_mysql \
-    php82-pdo_odbc \
-    php82-pdo_pgsql \
-    php82-pdo_sqlite \
-    php82-pear \
-    php82-pecl-apcu \
-    php82-pecl-memcached \
-    php82-pecl-redis \
-    php82-pgsql \
-    php82-posix \
-    php82-soap \
-    php82-sockets \
-    php82-sodium \
-    php82-sqlite3 \
-    php82-tokenizer \
-    php82-xmlreader \
-    php82-xsl \
+    php83-bcmath \
+    php83-bz2 \
+    php83-dom \
+    php83-exif \
+    php83-ftp \
+    php83-gd \
+    php83-gmp \
+    php83-imap \
+    php83-intl \
+    php83-ldap \
+    php83-mysqli \
+    php83-mysqlnd \
+    php83-opcache \
+    php83-pdo_mysql \
+    php83-pdo_odbc \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pear \
+    php83-pecl-apcu \
+    php83-pecl-memcached \
+    php83-pecl-redis \
+    php83-pgsql \
+    php83-posix \
+    php83-soap \
+    php83-sockets \
+    php83-sodium \
+    php83-sqlite3 \
+    php83-tokenizer \
+    php83-xmlreader \
+    php83-xsl \
    whois && \
  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    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 \
--- a/345
+++ b/345
@@ -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}")
@@ -257,114 +262,150 @@ pipeline {
        }
      }
      steps {
-        sh '''#! /bin/bash
-              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 
-              # 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}
-                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
-                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
-                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Updating Jenkinsfile"
-                rm -Rf ${TEMPDIR}
-                exit 0
-              else
-                echo "Jenkinsfile is up to date."
-              fi
-              # 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"
-              for i in ${OLD_TEMPLATES}; do
-                if [[ -f "${i}" ]]; then
-                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
-                fi
-              done
-              if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
-                mkdir -p ${TEMPDIR}/repo
-                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
-                for i in ${TEMPLATES_TO_DELETE}; do
-                  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
-                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old and deprecated templates"
-                rm -Rf ${TEMPDIR}
-                exit 0
-              else
-                echo "No templates to delete"
-              fi
-              # 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)
-              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
-                mkdir -p ${TEMPDIR}/repo
-                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
-                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
-                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
-                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
-                cd ${TEMPDIR}/repo/${LS_REPO}/
-                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
-                  echo ".jenkins-external" >> .gitignore
-                  git add .gitignore
-                fi
-                git add ${TEMPLATED_FILES}
-                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
-                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-              else
-                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-              fi
-              mkdir -p ${TEMPDIR}/gitbook
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              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
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
-                cd ${TEMPDIR}/gitbook/docker-documentation/
-                git add images/docker-${CONTAINER_NAME}.md
-                git commit -m 'Bot Updating Documentation'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
-              fi
-              mkdir -p ${TEMPDIR}/unraid
-              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
-              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
-              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
-                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
-              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
-                cd ${TEMPDIR}/unraid/templates/
-                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/
-                  git add -u unraid/${CONTAINER_NAME}.xml
-                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
-                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+            usernameVariable: 'DOCKERUSER',
+            passwordVariable: 'DOCKERPASS'
+          ]
+        ]) {
+          sh '''#! /bin/bash
+                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 
+                # 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}
+                  cd ${TEMPDIR}/repo/${LS_REPO}
+                  git checkout -f master
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+                  git add Jenkinsfile
+                  git commit -m 'Bot Updating Templated Files'
+                  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"
+                  rm -Rf ${TEMPDIR}
+                  exit 0
                else
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                  git add unraid/${CONTAINER_NAME}.xml
-                  git commit -m 'Bot Updating Unraid Template'
+                  echo "Jenkinsfile is up to date."
                fi
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
-              fi
-              rm -Rf ${TEMPDIR}'''
-        script{
-          env.FILES_UPDATED = sh(
-            script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
-            returnStdout: true).trim()
+                # 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
+                    TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
+                  fi
+                done
+                if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
+                  mkdir -p ${TEMPDIR}/repo
+                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                  cd ${TEMPDIR}/repo/${LS_REPO}
+                  git checkout -f master
+                  for i in ${TEMPLATES_TO_DELETE}; do
+                    git rm "${i}"
+                  done
+                  git commit -m 'Bot Updating Templated Files'
+                  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"
+                  rm -Rf ${TEMPDIR}
+                  exit 0
+                else
+                  echo "No templates to delete"
+                fi
+                # 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)
+                if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
+                  mkdir -p ${TEMPDIR}/repo
+                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                  cd ${TEMPDIR}/repo/${LS_REPO}
+                  git checkout -f master
+                  cd ${TEMPDIR}/docker-${CONTAINER_NAME}
+                  mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
+                  mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
+                  cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                  cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
+                  cd ${TEMPDIR}/repo/${LS_REPO}/
+                  if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
+                    echo ".jenkins-external" >> .gitignore
+                    git add .gitignore
+                  fi
+                  git add readme-vars.yml ${TEMPLATED_FILES}
+                  git commit -m 'Bot Updating Templated Files'
+                  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}
+                else
+                  echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                fi
+                mkdir -p ${TEMPDIR}/docs
+                git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+                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
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
+                  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
+                  git commit -m 'Bot Updating Documentation'
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+                fi
+                mkdir -p ${TEMPDIR}/unraid
+                git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
+                git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
+                if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
+                  sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+                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}" == "${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
+                  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/
+                    git add -u unraid/${CONTAINER_NAME}.xml
+                    git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                    git commit -m 'Bot Moving Deprecated Unraid Template' || :
+                  else
+                    cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                    git add unraid/${CONTAINER_NAME}.xml
+                    git commit -m 'Bot Updating Unraid Template'
+                  fi
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
+                fi
+                # Stage 4 - Sync Readme to Docker Hub
+                if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
+                  if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 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
+                  DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "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{
+            env.FILES_UPDATED = sh(
+              script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
+              returnStdout: true).trim()
+          }
        }
      }
    }
@@ -424,35 +465,6 @@ pipeline {
             "visibility":"public"}' '''
      } 
    }
-    /* #######################
-           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
-           '''
-      } 
-    }
    /* ###############
       Build Container
       ############### */
@@ -587,7 +599,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
@@ -848,37 +861,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
-    stage('Sync-README') {
+    // Add protection to the release branch
+    stage('Github-Release-Branch-Protection') {
      when {
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ]
-        ]) {
-          sh '''#! /bin/bash
-                set -e
-                TEMPDIR=$(mktemp -d)
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                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
-                docker run --rm=true \
-                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
-                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
-                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
-                  -e DOCKER_REPOSITORY=${IMAGE} \
-                  -e GIT_BRANCH=master \
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
-                rm -Rf ${TEMPDIR} '''
-        }
+        echo "Setting up protection for release branch master"
+        sh '''#! /bin/bash
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
+          -d $(jq -c .  << EOF
+            {
+              "required_status_checks": null,
+              "enforce_admins": false,
+              "required_pull_request_reviews": {
+                "dismiss_stale_reviews": false,
+                "require_code_owner_reviews": false,
+                "require_last_push_approval": false,
+                "required_approving_review_count": 1
+              },
+              "restrictions": null,
+              "required_linear_history": false,
+              "allow_force_pushes": false,
+              "allow_deletions": false,
+              "block_creations": false,
+              "required_conversation_resolution": true,
+              "lock_branch": false,
+              "allow_fork_syncing": false,
+              "required_signatures": false
+            }
+EOF
+          ) '''
      }
    }
    // If this is a Pull request send the CI link as a comment on it
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-swag/blob/master/.github/CONTRIBUTING.md -->
-
+<!-- DO NOT EDIT THIS FILE MANUALLY -->
+<!-- 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
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+id your_user
+```
+
+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`
-* To monitor the logs of the container in realtime: `docker logs -f swag`
-* container version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' swag`
-* image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/swag:latest`
+* Shell access whilst the container is running:
+
+    ```bash
+    docker exec -it swag /bin/bash
+    ```
+
+* 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`
-  * or update a single image: `docker-compose pull swag`
-* Let compose update all containers as necessary: `docker-compose up -d`
-  * or update a single container: `docker-compose up -d swag`
-* You can also remove the old dangling images: `docker image prune`
+* Update images:
+    * All images:
+
+        ```bash
+        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`
-* Stop the running container: `docker stop swag`
-* Delete the container: `docker rm swag`
+* Update the image:
+
+    ```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)
-
-* 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).
+    ```bash
+    docker image prune
+    ```

 ### 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,16 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

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

 # changelog
 changelogs:
+  - { 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." }
--- a/root/defaults/dns-conf/bunny.ini
+++ b/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
--- a/root/defaults/dns-conf/dreamhost.ini
+++ b/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>"
--- a/root/defaults/dns-conf/dynu.ini
+++ b/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
--- a/root/defaults/dns-conf/freedns.ini
+++ b/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
--- a/root/defaults/dns-conf/glesys.ini
+++ b/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
--- a/root/defaults/dns-conf/namecheap.ini
+++ b/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
--- a/root/defaults/fail2ban/filter.d/nginx-deny.conf
+++ b/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
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,4 +1,4 @@
-## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2023/11/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample

 # redirect all traffic to https
 server {
@@ -48,10 +48,24 @@ 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.php$is_args$args;
    }

    location ~ ^(.+\.php)(.*)$ {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable for ldap auth (requires ldap-server.conf in the server block)
+        #include /config/nginx/ldap-location.conf;
+
+        # enable for Authelia (requires authelia-server.conf in the server block)
+        #include /config/nginx/authelia-location.conf;
+
+        # enable for Authentik (requires authentik-server.conf in the server block)
+        #include /config/nginx/authentik-location.conf;
+
+        try_files $fastcgi_script_name =404;
        fastcgi_split_path_info ^(.+\.php)(.*)$;
        fastcgi_pass 127.0.0.1:9000;
        fastcgi_index index.php;
--- a/root/etc/crontabs/abc
+++ b/root/etc/crontabs/abc
--- a/root/etc/crontabs/root
+++ b/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
--- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run
@@ -24,18 +24,44 @@ for i in "${SANED_VARS[@]}"; do
 done

 # 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
-    echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details."
+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)
+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/
+cp -n /defaults/dns-conf/* /config/dns-conf/ 2> >(grep -v 'cp: not replacing')
 lsiown -R abc:abc /config/dns-conf

 # copy default renewal hooks
 chmod -R +x /defaults/etc/letsencrypt/renewal-hooks
-cp -nR /defaults/etc/letsencrypt/renewal-hooks/* /config/etc/letsencrypt/renewal-hooks/
+cp -nR /defaults/etc/letsencrypt/renewal-hooks/* /config/etc/letsencrypt/renewal-hooks/ 2> >(grep -v 'cp: not replacing')
 lsiown -R abc:abc /config/etc/letsencrypt/renewal-hooks

 # replace nginx service location in renewal hooks
@@ -157,21 +183,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_ZEROSSL_EAB_KID=$(echo "${REV_EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_kid'])")
-        REV_ZEROSSL_EAB_HMAC_KEY=$(echo "${REV_EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_hmac_key'])")
+        REV_ACMESERVER=("https://acme.zerossl.com/v2/DV90")
+        REV_ZEROSSL_EAB_KID=$(awk -F "=" '/eab-kid/ {print $2}' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" | tr -d ' ')
+        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."
-            sleep infinity
+            REV_ZEROSSL_EAB_KID=$(awk -F "=" '/eab-kid/ {print $2}' /config/etc/letsencrypt/cli.ini | tr -d ' ')
+            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 +212,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 +240,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
-            export URL_REAL="-d *.${URL}"
-            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
+        SUBDOMAINS_ARRAY+=("*.${URL}")
+        echo "Wildcard cert for ${URL} will be requested"
    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
-            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}"
+        echo "Sub-domains processed are: $(echo "${SUBDOMAINS_ARRAY[*]}" | tr " " ",")"
    fi
-else
-    echo "No subdomains defined"
-    URL_REAL="-d ${URL}"
+    DOMAINS_ARRAY+=("${SUBDOMAINS_ARRAY[@]}")
 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}"
-    URL_REAL="${URL_REAL} ${EXTRA_DOMAINS_REAL}"
+    echo "Extra domains processed are: $(echo "${EXTRA_DOMAINS_ARRAY[*]}" | tr " " ",")"
+    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 +296,41 @@ fi

 # setting the validation method to use
 if [[ "${VALIDATION}" = "dns" ]]; then
-    AUTHENTICATORPARAM="--authenticator dns-${DNSPLUGIN}"
-    DNSCREDENTIALSPARAM="--dns-${DNSPLUGIN}-credentials ${DNSCREDENTIALFILE}"
-    if [[ -n "${PROPAGATION}" ]]; then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
+    set_ini_value "preferred-challenges" "dns" /config/etc/letsencrypt/cli.ini
+    set_ini_value "authenticator" "dns-${DNSPLUGIN}" /config/etc/letsencrypt/cli.ini
+    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}"
-        DNSCREDENTIALSPARAM="--${DNSPLUGIN}-credentials ${DNSCREDENTIALFILE}"
-        if [[ -n "${PROPAGATION}" ]]; then PROPAGATIONPARAM="--${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
+        sed -i "/^dns-${DNSPLUGIN}-credentials\b/d" /config/etc/letsencrypt/cli.ini
+        sed -i "/^dns-${DNSPLUGIN}-propagation-seconds\b/d" /config/etc/letsencrypt/cli.ini
+        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 +339,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_HMAC_KEY=$(echo "${EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_hmac_key'])")
+        ZEROSSL_EAB_KID=$(echo "${EAB_CREDS}" | jq .eab_kid)
+        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 --server ${ACMESERVER} ${ZEROSSL_EAB} ${PREFCHAL} --rsa-key-size 4096 ${EMAILPARAM} --agree-tos ${URL_REAL}
+    certbot certonly --non-interactive --renew-by-default
    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."
--- a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run
+++ b/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/
-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/
-fi
-# set permissions and import user crontabs
-lsiown abc:abc /config/crontabs/abc
-crontab -u abc /config/crontabs/abc
--- a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type
+++ b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type
@@ -1 +0,0 @@
-oneshot
--- a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up
+++ b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-crontabs-config/run
--- a/root/etc/s6-overlay/s6-rc.d/init-folders-config/run
+++ b/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 \
--- a/root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontabs-config
+++ b/root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontabs-config
--- a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/dependencies.d/init-fail2ban-config
+++ b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/dependencies.d/init-fail2ban-config
--- a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontabs-config
+++ b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontabs-config
Author	SHA1	Message	Date
LinuxServer-CI	cb3c74a6ee	Bot Updating Package Versions	2024-02-08 21:18:13 +00:00
LinuxServer-CI	b7f40863fe	Bot Updating Package Versions	2024-02-03 03:21:47 +00:00
LinuxServer-CI	ec6fca9418	Bot Updating Package Versions	2024-01-27 18:57:53 +00:00
Eric Nemchik	25a2832056	Merge pull request #441 from linuxserver/3.19 Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate	2024-01-27 12:52:12 -06:00
LinuxServer-CI	3eabd75388	Bot Updating Package Versions	2024-01-27 03:17:21 +00:00
Eric Nemchik	6ed17c1d52	Merge branch 'master' into 3.19	2024-01-23 20:27:06 -06:00
LinuxServer-CI	e568785908	Bot Updating Package Versions	2024-01-20 03:20:49 +00:00
LinuxServer-CI	bcee5182e6	Bot Updating Package Versions	2024-01-13 03:22:08 +00:00
LinuxServer-CI	514cf42606	Bot Updating Templated Files	2024-01-13 03:17:41 +00:00
LinuxServer-CI	270a0d57c9	Bot Updating Package Versions	2024-01-09 20:00:59 +00:00
LinuxServer-CI	6f51d8be26	Bot Updating Templated Files	2024-01-09 19:54:13 +00:00
LinuxServer-CI	d915d516cd	Bot Updating Templated Files	2024-01-09 19:47:00 +00:00
Eric Nemchik	ffb03a03f5	Merge pull request #425 from Peglah/dns_glesys Add GleSYS DNS plugin	2024-01-09 13:43:24 -06:00
Eric Nemchik	9693b5884f	Merge branch 'master' into dns_glesys	2024-01-09 13:28:15 -06:00
LinuxServer-CI	87ca95c8c2	Bot Updating Package Versions	2024-01-06 03:21:45 +00:00
Peglah	1a376a6975	rebased	2024-01-01 09:49:44 +01:00
Peglah	8e74593f2c	Rebase, Add GleSYS DNS plugin	2024-01-01 09:40:00 +01:00
LinuxServer-CI	00d1bce24d	Bot Updating Package Versions	2024-01-01 09:39:14 +01:00
LinuxServer-CI	be853fcb4b	Bot Updating Package Versions	2024-01-01 09:39:14 +01:00
LinuxServer-CI	2fb6c1f51f	Bot Updating Package Versions	2024-01-01 09:39:14 +01:00
LinuxServer-CI	9339d287d2	Bot Updating Package Versions	2024-01-01 09:39:14 +01:00
LinuxServer-CI	6b62a27bf0	Bot Updating Templated Files	2024-01-01 09:39:14 +01:00
Eric Nemchik	c50ca83ef9	Deprecate certbot-dns-dynu Signed-off-by: GitHub <noreply@github.com>	2024-01-01 09:39:10 +01:00
LinuxServer-CI	bd94a67024	Bot Updating Package Versions	2024-01-01 09:38:33 +01:00
LinuxServer-CI	11e060174b	Bot Updating Package Versions	2024-01-01 09:38:33 +01:00
driz	5f8a531a93	Update nginx-deny.conf	2024-01-01 09:38:33 +01:00
LinuxServer-CI	d2f843c4d1	Bot Updating Package Versions	2024-01-01 09:38:33 +01:00
LinuxServer-CI	ad6bb30bfc	Bot Updating Package Versions	2024-01-01 09:38:33 +01:00
LinuxServer-CI	11991aa0b3	Bot Updating Package Versions	2024-01-01 09:38:33 +01:00
LinuxServer-CI	c76e664965	Bot Updating Templated Files	2024-01-01 09:38:33 +01:00
Eric Nemchik	ccbd19fe62	Update readme-vars.yml	2024-01-01 09:38:29 +01:00
LinuxServer-CI	2573b79bad	Bot Updating Package Versions	2024-01-01 09:37:47 +01:00
LinuxServer-CI	0e5ba91588	Bot Updating Templated Files	2024-01-01 09:37:47 +01:00
Eric Nemchik	4f92460b29	Run certbot as root to allow fix http validation Fixes regression from https://github.com/linuxserver/docker-swag/pull/399 Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:37:39 +01:00
Eric Nemchik	ad1884e5b4	Fix index.php being downloaded on 404 Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:36:59 +01:00
LinuxServer-CI	70bea0a816	Bot Updating Package Versions	2024-01-01 09:23:16 +01:00
Eric Nemchik	85e44eb399	fix chown for group Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	4d3f30b67c	Move crontabs to etc Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	9da97969f8	Crontabs folder created in base Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	2cd84ad12b	cron in base Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	757ef31216	set owner of certbot folders to abc Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	767aad2286	Fix perms Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	4cb18bc106	standard cron Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
LinuxServer-CI	b1cf98d214	Bot Updating Package Versions	2024-01-01 09:23:16 +01:00
LinuxServer-CI	48dfde26c7	Bot Updating Templated Files	2024-01-01 09:23:16 +01:00
LinuxServer-CI	320404d358	Bot Updating Package Versions	2024-01-01 09:23:16 +01:00
aptalca	52ae487bea	install mcrypt from community repo on alpine edge	2024-01-01 09:23:16 +01:00
LinuxServer-CI	65f62d14a6	Bot Updating Package Versions	2024-01-01 09:23:16 +01:00
LinuxServer-CI	accd20cc7a	Bot Updating Package Versions	2023-12-30 03:18:23 +00:00
Eric Nemchik	24b3540da5	Fix php83-pecl-mcrypt Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-12-23 16:18:56 -06:00
Eric Nemchik	bc31b51afb	Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-12-23 16:12:03 -06:00
LinuxServer-CI	bf6ab14281	Bot Updating Package Versions	2023-12-23 03:17:49 +00:00
LinuxServer-CI	7c5d1d886c	Bot Updating Package Versions	2023-12-16 03:18:17 +00:00
LinuxServer-CI	5b77a54620	Bot Updating Package Versions	2023-12-12 13:36:29 +00:00
LinuxServer-CI	3b1478667b	Bot Updating Templated Files	2023-12-12 13:33:00 +00:00
Eric Nemchik	0ddf8a270b	Merge pull request #439 from linuxserver/deprecate-dynu-plugin Deprecate certbot-dns-dynu	2023-12-12 07:31:30 -06:00
Eric Nemchik	dabbaa3b14	Deprecate certbot-dns-dynu Signed-off-by: GitHub <noreply@github.com>	2023-12-11 22:17:57 +00:00
LinuxServer-CI	bdd5e047ee	Bot Updating Package Versions	2023-12-09 03:20:23 +00:00
LinuxServer-CI	78689b02e2	Bot Updating Package Versions	2023-12-07 13:54:35 +00:00
driz	6c1c4cd00a	Update nginx-deny.conf	2023-12-07 08:50:27 -05:00
LinuxServer-CI	31cef5050f	Bot Updating Package Versions	2023-12-06 01:09:14 +00:00
LinuxServer-CI	52e8f7223e	Bot Updating Package Versions	2023-12-02 03:18:16 +00:00
LinuxServer-CI	1abab5cb6d	Bot Updating Package Versions	2023-11-30 23:41:43 +00:00
LinuxServer-CI	0061faef15	Bot Updating Templated Files	2023-11-30 23:38:22 +00:00
Eric Nemchik	6e64bcbd7e	Merge pull request #432 from linuxserver/php-404 Fix index.php being downloaded on 404	2023-11-30 17:36:52 -06:00
Eric Nemchik	b9dd1b7c5a	Update readme-vars.yml	2023-11-30 17:33:07 -06:00
Eric Nemchik	e9bceab763	Merge branch 'master' into php-404	2023-11-30 17:29:03 -06:00
LinuxServer-CI	eba3c341fa	Bot Updating Package Versions	2023-11-28 19:55:58 +00:00
LinuxServer-CI	5fc5825afd	Bot Updating Templated Files	2023-11-28 19:50:37 +00:00
Eric Nemchik	de18e4ef24	Merge pull request #431 from linuxserver/root-certbot Run certbot as root to allow fix http validation	2023-11-28 13:49:03 -06:00
Eric Nemchik	fbe212b67c	Fix index.php being downloaded on 404 Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-11-27 18:27:05 -06:00
LinuxServer-CI	2ca6807b64	Bot Updating Package Versions	2023-11-25 03:18:43 +00:00
Eric Nemchik	e3560414dc	Run certbot as root to allow fix http validation Fixes regression from https://github.com/linuxserver/docker-swag/pull/399 Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-11-23 07:50:53 -06:00
Eric Nemchik	2f4162578f	Merge pull request #399 from linuxserver/standard-cron standard cron	2023-11-18 19:11:17 -06:00
LinuxServer-CI	2697b74a8c	Bot Updating Package Versions	2023-11-18 03:21:34 +00:00
LinuxServer-CI	bd685533a2	Bot Updating Templated Files	2023-11-18 03:17:25 +00:00
LinuxServer-CI	287b952aea	Bot Updating Package Versions	2023-11-13 22:20:05 +00:00
aptalca	576b81ab91	Merge pull request #428 from linuxserver/mcrypt install mcrypt from community repo on alpine edge	2023-11-13 17:16:22 -05:00
aptalca	8b0df1fcbb	install mcrypt from community repo on alpine edge	2023-11-13 16:58:13 -05:00
LinuxServer-CI	efdfa45f37	Bot Updating Package Versions	2023-11-11 03:21:56 +00:00
Peglah	278b57fb47	Add GleSYS DNS plugin	2023-11-08 12:42:43 +01:00
Eric Nemchik	82e85d22c1	Merge branch 'master' into standard-cron	2023-11-04 18:37:38 -05:00
Eric Nemchik	8b49f2b0d4	fix chown for group Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-11-04 18:36:31 -05:00
LinuxServer-CI	10d0877547	Bot Updating Package Versions	2023-11-04 03:17:44 +00:00
Eric Nemchik	8fdb472564	Merge branch 'master' into standard-cron	2023-11-01 17:48:15 -05:00
LinuxServer-CI	f6d0e3089a	Bot Updating Package Versions	2023-11-01 15:18:10 +00:00
LinuxServer-CI	5ceac2e2ec	Bot Updating Package Versions	2023-10-28 03:17:26 +00:00
LinuxServer-CI	5b6498b1a9	Bot Updating Package Versions	2023-10-25 16:20:53 +00:00
LinuxServer-CI	118a76530e	Bot Updating Package Versions	2023-10-24 00:07:06 +00:00
LinuxServer-CI	0499547b96	Bot Updating Package Versions	2023-10-21 03:17:27 +00:00
LinuxServer-CI	9cf01a0085	Bot Updating Package Versions	2023-10-20 01:05:07 +00:00
LinuxServer-CI	2b5a2785d6	Bot Updating Package Versions	2023-10-14 03:18:59 +00:00
LinuxServer-CI	202db184b3	Bot Updating Package Versions	2023-10-10 16:23:56 +00:00
LinuxServer-CI	3ed39caf43	Bot Updating Package Versions	2023-10-07 03:22:54 +00:00
LinuxServer-CI	9353e4e8a5	Bot Updating Templated Files	2023-10-07 03:19:04 +00:00
LinuxServer-CI	39e3159f39	Bot Updating Templated Files	2023-10-07 03:16:45 +00:00
Roxedus	9ba44dccee	Merge pull request #415 from linuxserver/2.7-fix	2023-10-04 01:33:49 +02:00
Roxedus	49f6fb2b6e	Update detection	2023-10-04 00:33:00 +02:00
LinuxServer-CI	693c24173b	Bot Updating Package Versions	2023-10-03 20:17:30 +00:00
LinuxServer-CI	8a90cf85d8	Bot Updating Package Versions	2023-10-01 16:32:35 +00:00
LinuxServer-CI	fd958fe6b3	Bot Updating Templated Files	2023-10-01 16:29:08 +00:00
Eric Nemchik	eb8f12b5de	Merge pull request #412 from Platzii/directadmin-fix Fix "unrecognized arguments" issue in DirectAdmin DNS plugin	2023-10-01 11:27:34 -05:00
Simon Lepla	dae223ca0f	Fix "unrecognized arguments" issue in DirectAdmin DNS plugin	2023-10-01 12:07:41 +02:00
LinuxServer-CI	14226ce700	Bot Updating Package Versions	2023-09-30 03:22:11 +00:00
LinuxServer-CI	b64bb62303	Bot Updating Package Versions	2023-09-23 03:18:35 +00:00
LinuxServer-CI	f478a200e8	Bot Updating Package Versions	2023-09-19 19:17:39 +00:00
LinuxServer-CI	40200982d1	Bot Updating Package Versions	2023-09-19 19:12:05 +00:00
Adam	3476f8b6f6	Merge pull request #406 from linuxserver/namecheap	2023-09-19 20:08:26 +01:00
LinuxServer-CI	3e9dc80ed4	Bot Updating Package Versions	2023-09-16 03:17:06 +00:00
LinuxServer-CI	4486d528d1	Bot Updating Package Versions	2023-09-09 03:19:54 +00:00
LinuxServer-CI	e0032ecfd4	Bot Updating Package Versions	2023-09-02 03:16:49 +00:00
Eric Nemchik	b1c1262a2c	Add Namecheap DNS plugin Signed-off-by: GitHub <noreply@github.com>	2023-08-28 14:38:34 +00:00
LinuxServer-CI	3b49643c78	Bot Updating Package Versions	2023-08-26 03:18:54 +00:00
Eric Nemchik	23728cba0b	Move crontabs to etc Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-08-19 10:17:40 -05:00
Eric Nemchik	7e1db9c562	Crontabs folder created in base Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-08-19 08:42:48 -05:00
Eric Nemchik	919b8ac152	cron in base Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-08-18 23:38:31 -05:00
LinuxServer-CI	0f9d247ba4	Bot Updating Package Versions	2023-08-19 03:17:05 +00:00
LinuxServer-CI	cab0b86b65	Bot Updating Package Versions	2023-08-12 19:50:39 +00:00
Eric Nemchik	4d3875d37e	Merge pull request #403 from linuxserver/freedns Freedns	2023-08-12 14:45:40 -05:00
Eric Nemchik	badea52047	Add FreeDNS plugin Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-08-12 13:55:53 -05:00
Eric Nemchik	97baf76a10	Get available DNS Authenticator plugins from CLI Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-08-12 13:47:44 -05:00
LinuxServer-CI	6ed02e1e00	Bot Updating Package Versions	2023-08-12 03:18:10 +00:00
LinuxServer-CI	a6778ab7c7	Bot Updating Package Versions	2023-08-07 14:06:58 +00:00
LinuxServer-CI	95c791acfc	Bot Updating Templated Files	2023-08-07 14:01:37 +00:00
Eric Nemchik	42ccafc064	Merge pull request #390 from ejach/certbot-dns-bunny Added certbot-dns-bunny to allow Bunny dns verification	2023-08-07 09:00:03 -05:00
Eric Nemchik	6b7cdb26f1	Update readme-vars.yml	2023-08-07 08:46:20 -05:00
Evan J	e19a030eff	Merge branch 'master' into certbot-dns-bunny	2023-08-07 09:08:36 -04:00
LinuxServer-CI	4d4cb0ca74	Bot Updating Package Versions	2023-08-05 03:18:48 +00:00
Eric Nemchik	0b738d9ee0	set owner of certbot folders to abc Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-07-31 15:13:43 -05:00
Eric Nemchik	269e9cdd3f	Fix perms Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-07-30 09:50:18 -05:00
Eric Nemchik	17387674b8	standard cron Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-07-30 01:17:57 -05:00
Evan J	9554582962	Merge branch 'master' into certbot-dns-bunny	2023-07-29 08:00:04 -04:00
LinuxServer-CI	42ebe4a584	Bot Updating Package Versions	2023-07-29 00:21:48 +00:00
Eric Nemchik	b9f5763ee5	Merge pull request #398 from linuxserver/fix-ini-value-remove Fix removing ini values	2023-07-28 19:17:06 -05:00
Eric Nemchik	2b0bf5869c	Fix removing ini values - missing -i flag - use word boundary instead of space Signed-off-by: GitHub <noreply@github.com>	2023-07-28 18:59:20 +00:00
Evan J	b46830f214	Merge branch 'master' into certbot-dns-bunny	2023-07-28 13:13:29 -04:00
LinuxServer-CI	66a8694772	Bot Updating Package Versions	2023-07-28 11:52:17 +00:00
LinuxServer-CI	33568e1bd3	Bot Updating Templated Files	2023-07-28 11:48:32 +00:00
Eric Nemchik	0004cd1ce8	Merge pull request #376 from gilesp/master Adds certbot-dns-dreamhost to allow dreamhost dns verification	2023-07-28 06:46:11 -05:00
Giles Paterson	8dbd50ac06	Updates changelog date	2023-07-28 10:40:14 +01:00
Eric Nemchik	cae42496e2	Merge branch 'master' into certbot-dns-bunny	2023-07-27 09:44:46 -05:00
Eric Nemchik	2f8c5b4487	Merge branch 'master' into master	2023-07-27 09:32:01 -05:00
LinuxServer-CI	9f75c7a713	Bot Updating Package Versions	2023-07-27 14:24:01 +00:00
Eric Nemchik	262c1013aa	Merge pull request #339 from linuxserver/certbot-revamp-config-file Use config file with certbot	2023-07-27 09:20:30 -05:00
Eric Nemchik	54e4cfa047	Merge branch 'master' into certbot-revamp-config-file	2023-07-27 08:05:58 -05:00
LinuxServer-CI	97ba6a7de9	Bot Updating Package Versions	2023-07-22 03:17:29 +00:00
LinuxServer-CI	f11a753445	Bot Updating Package Versions	2023-07-15 03:33:59 +00:00
Eric Nemchik	ee6153c817	Merge branch 'master' into certbot-revamp-config-file	2023-07-10 18:45:22 -05:00
LinuxServer-CI	93424877a9	Bot Updating Package Versions	2023-07-08 03:32:56 +00:00
Evan J	eaf8b3648b	Merge branch 'master' into certbot-dns-bunny	2023-07-03 14:32:18 +00:00
LinuxServer-CI	b754cedda2	Bot Updating Templated Files	2023-07-01 15:08:48 +00:00
Eric Nemchik	0d05560652	Merge pull request #393 from linuxserver/typo Update readme-vars.yml	2023-07-01 10:06:35 -05:00
Eric Nemchik	7f9b637353	Update readme-vars.yml Fix typo	2023-07-01 09:52:38 -05:00
LinuxServer-CI	675d67bbd4	Bot Updating Package Versions	2023-07-01 03:37:47 +00:00
LinuxServer-CI	402d513115	Bot Updating Templated Files	2023-07-01 03:33:10 +00:00
Evan J	fac669ea43	Added certbot-dns-bunny	2023-06-25 20:31:19 +01:00
LinuxServer-CI	3aab75dc8b	Bot Updating Package Versions	2023-06-24 03:32:04 +00:00
LinuxServer-CI	b2e8d8c8ab	Bot Updating Package Versions	2023-06-17 03:18:40 +00:00
Giles Paterson	973abbefbb	Merge branch 'linuxserver:master' into master	2023-06-16 10:09:14 +01:00
LinuxServer-CI	dede63fdcf	Bot Updating Package Versions	2023-06-10 03:19:40 +00:00
LinuxServer-CI	bee6793d45	Bot Updating Package Versions	2023-06-09 14:21:26 +00:00
Eric Nemchik	29e9daa606	Merge pull request #381 from linuxserver/suppress-not-replacing Suppress cp: not replacing	2023-06-09 09:17:40 -05:00
LinuxServer-CI	57c0d1f81e	Bot Updating Package Versions	2023-06-07 12:44:02 +00:00
Eric Nemchik	416bef8a2e	Merge pull request #383 from linuxserver/php-auth Add auth comments for php location	2023-06-07 07:39:45 -05:00
Eric Nemchik	500d5606e4	Update default.conf.sample date	2023-06-05 13:41:08 -05:00
Eric Nemchik	500fd0c634	Add auth comments for php location	2023-06-05 13:37:01 -05:00
LinuxServer-CI	adf38bcd2b	Bot Updating Package Versions	2023-06-03 03:17:12 +00:00
Eric Nemchik	5255b117f9	Suppress cp: not replacing Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-01 19:09:13 -05:00
Eric Nemchik	d7a8d6cc6a	Merge branch 'master' into certbot-revamp-config-file	2023-05-31 11:33:45 -05:00
Giles Paterson	d67459e852	Merge branch 'linuxserver:master' into master	2023-05-31 12:10:41 +01:00
Giles Paterson	0ddb5be5f5	adds dreamhost dns plugin	2023-05-31 12:08:48 +01:00
Eric Nemchik	9d695718f0	Merge branch 'master' into certbot-revamp-config-file	2023-05-11 13:45:38 -05:00
Eric Nemchik	908571dea8	Merge branch 'master' into certbot-revamp-config-file	2023-05-07 09:17:28 -05:00
Eric Nemchik	d7e2455e7a	Merge remote-tracking branch 'origin/master' into certbot-revamp-config-file	2023-04-23 08:02:46 -05:00
Eric Nemchik	ebd233860e	Merge remote-tracking branch 'origin/master' into certbot-revamp-config-file	2023-03-10 15:10:35 +00:00
Eric Nemchik	5fb909d7dc	Use existing EAB values for revoke Attempt to revoke by name if cert path does not exist	2023-02-18 21:20:45 -06:00
Eric Nemchik	fd6d8764a2	Fix spelling	2023-02-18 19:40:43 -06:00
Eric Nemchik	ab7c85e4de	Don't match whole line in cli.ini search for agree-tos	2023-02-18 19:35:33 -06:00
Eric Nemchik	d60847483d	ensure config files exist and has at least one value set set_ini_value does not work on empty files	2023-02-18 19:08:28 -06:00
Eric Nemchik	53bb2e284f	Add descriptive comments to set_ini_value	2023-02-18 18:42:59 -06:00
Eric Nemchik	43e50ffb03	Rewrite domain handling Use jq instead of python for ZeroSSL vars	2023-02-18 18:28:03 -06:00
Eric Nemchik	18019fb216	Adjust REV_ACMESERVER handling	2023-02-18 17:26:34 -06:00
Eric Nemchik	d57dffef82	Use config file with certbot	2023-02-18 10:05:06 -06:00
				`@@ -1 +0,0 @@`
				`/etc/s6-overlay/s6-rc.d/init-crontabs-config/run`