Bot Updating Package Versions

route53 no longer supports propagation

.github/workflows/call_invalid_helper.yml

@@ -1,12 +0,0 @@
-name: Comment on invalid interaction
-on:
-  issues:
-    types:
-      - labeled
-jobs:
-  add-comment-on-invalid:
-    if: github.event.label.name == 'invalid'
-    permissions:
-      issues: write
-    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
-    secrets: inherit

.github/workflows/call_issue_pr_tracker.yml

@@ -0,0 +1,14 @@
+name: Issue & PR Tracker
+
+on:
+  issues:
+    types: [opened,reopened,labeled,unlabeled]
+  pull_request_target:
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
+
+jobs:
+  manage-project:
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
+    secrets: inherit

.github/workflows/call_issues_cron.yml

@@ -0,0 +1,13 @@
+name: Mark stale issues and pull requests
+on:
+  schedule:
+    - cron:  '35 15 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+    permissions:
+      issues: write
+      pull-requests: write
+    uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
+    secrets: inherit

.github/workflows/package_trigger_scheduler.yml

@@ -2,7 +2,7 @@ name: Package Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '03 5 * * 4'
+    - cron:  '1 3 * * 6'
   workflow_dispatch:
 
 jobs:

.github/workflows/permissions.yml

@@ -1,9 +1,10 @@
 name: Permission check
 on:
-  pull_request:
+  pull_request_target:
     paths:
       - '**/run'
       - '**/finish'
+      - '**/check'
 jobs:
   permission_check:
     uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

.github/workflows/stale.yml

@@ -1,23 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: "30 1 * * *"
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/stale@v6.0.1
-      with:
-        stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
-        stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'
-        days-before-stale: 30
-        days-before-close: 365
-        exempt-issue-labels: 'awaiting-approval,work-in-progress'
-        exempt-pr-labels: 'awaiting-approval,work-in-progress'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -113,6 +113,7 @@ RUN \
     certbot-dns-gehirn \
     certbot-dns-godaddy \
     certbot-dns-google \
+    certbot-dns-google-domains \
     certbot-dns-he \
     certbot-dns-hetzner \
     certbot-dns-infomaniak \
@@ -147,7 +148,7 @@ RUN \
     's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
     /defaults/nginx/ssl.conf.sample && \
   echo "**** correct ip6tables legacy issue ****" && \
-  rm \ 
+  rm \
     /sbin/ip6tables && \
   ln -s \
     /sbin/ip6tables-nft /sbin/ip6tables && \
@@ -158,6 +159,8 @@ RUN \
   mkdir -p /defaults/fail2ban && \
   mv /etc/fail2ban/action.d /defaults/fail2ban/ && \
   mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \
+  echo "**** define allowipv6 to silence warning ****" && \
+  sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban/fail2ban.conf && \
   echo "**** copy proxy confs to /defaults ****" && \
   mkdir -p \
     /defaults/nginx/proxy-confs && \

Dockerfile.aarch64

@@ -113,6 +113,7 @@ RUN \
     certbot-dns-gehirn \
     certbot-dns-godaddy \
     certbot-dns-google \
+    certbot-dns-google-domains \
     certbot-dns-he \
     certbot-dns-hetzner \
     certbot-dns-infomaniak \
@@ -147,7 +148,7 @@ RUN \
     's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
     /defaults/nginx/ssl.conf.sample && \
   echo "**** correct ip6tables legacy issue ****" && \
-  rm \ 
+  rm \
     /sbin/ip6tables && \
   ln -s \
     /sbin/ip6tables-nft /sbin/ip6tables && \
@@ -158,6 +159,8 @@ RUN \
   mkdir -p /defaults/fail2ban && \
   mv /etc/fail2ban/action.d /defaults/fail2ban/ && \
   mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \
+  echo "**** define allowipv6 to silence warning ****" && \
+  sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban/fail2ban.conf && \
   echo "**** copy proxy confs to /defaults ****" && \
   mkdir -p \
     /defaults/nginx/proxy-confs && \

Dockerfile.armhf

@@ -113,6 +113,7 @@ RUN \
     certbot-dns-gehirn \
     certbot-dns-godaddy \
     certbot-dns-google \
+    certbot-dns-google-domains \
     certbot-dns-he \
     certbot-dns-hetzner \
     certbot-dns-infomaniak \
@@ -147,7 +148,7 @@ RUN \
     's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
     /defaults/nginx/ssl.conf.sample && \
   echo "**** correct ip6tables legacy issue ****" && \
-  rm \ 
+  rm \
     /sbin/ip6tables && \
   ln -s \
     /sbin/ip6tables-nft /sbin/ip6tables && \
@@ -158,6 +159,8 @@ RUN \
   mkdir -p /defaults/fail2ban && \
   mv /etc/fail2ban/action.d /defaults/fail2ban/ && \
   mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \
+  echo "**** define allowipv6 to silence warning ****" && \
+  sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban/fail2ban.conf && \
   echo "**** copy proxy confs to /defaults ****" && \
   mkdir -p \
     /defaults/nginx/proxy-confs && \

Jenkinsfile

@@ -57,7 +57,7 @@ pipeline {
           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/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
+          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'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -230,17 +230,14 @@ pipeline {
           }
           sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
           sh '''#! /bin/bash
-                set -e
-                docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
                 docker run --rm \
-                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
+                  -v ${WORKSPACE}:/mnt \
-                -e FILE_NAME="shellcheck-result.xml" \
+                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
-                -e MIMETYPE="text/xml" \
+                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                -v ${WORKSPACE}:/mnt \
+                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                -e SECRET_KEY=\"${S3_SECRET}\" \
+                    apk add --no-cache py3-pip && \
-                -e ACCESS_KEY=\"${S3_KEY}\" \
+                    pip install s3cmd && \
-                -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
+                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
-                python /upload.py'''
         }
       }
     }
@@ -277,7 +274,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md"
+              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}"
@@ -294,7 +291,7 @@ pipeline {
                 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 templates"
+                echo "Deleting old and deprecated templates"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else

README.md

@@ -215,7 +215,7 @@ 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`, `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`, `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 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` |
@@ -336,6 +336,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **25.03.23:** - Fix renewal post hook.
+* **10.03.23:** - Cleanup unused csr and keys folders. See [certbot 2.3.0 release notes](https://github.com/certbot/certbot/releases/tag/v2.3.0).
+* **09.03.23:** - Add Google Domains DNS support, `google-domains`.
 * **02.03.23:** - Set permissions on crontabs during init.
 * **09.02.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf, authelia-location.conf and authelia-server.conf - Add Authentik configs, update Authelia configs.
 * **06.02.23:** - Add porkbun support back in.

package_versions.txt

@@ -2,27 +2,27 @@ NAME                            VERSION                TYPE
 ConfigArgParse                  1.5.3                  python  
 PyJWT                           2.6.0                  python  
 PyYAML                          6.0                    python  
-acme                            2.4.0                  python  
+acme                            2.5.0                  python  
 alpine-baselayout               3.4.0-r0               apk     
 alpine-baselayout-data          3.4.0-r0               apk     
 alpine-keys                     2.4-r1                 apk     
-alpine-release                  3.17.2-r0              apk     
+alpine-release                  3.17.3-r0              apk     
 aom-libs                        3.5.0-r0               apk     
-apache2-utils                   2.4.55-r0              apk     
+apache2-utils                   2.4.56-r0              apk     
 apk-tools                       2.12.10-r1             apk     
 apr                             1.7.2-r0               apk     
 apr-util                        1.6.3-r0               apk     
 argon2-libs                     20190702-r2            apk     
 attrs                           22.2.0                 python  
 azure-common                    1.1.28                 python  
-azure-core                      1.26.3                 python  
+azure-core                      1.26.4                 python  
 azure-identity                  1.12.0                 python  
-azure-mgmt-core                 1.3.2                  python  
+azure-mgmt-core                 1.4.0                  python  
 azure-mgmt-dns                  8.0.0                  python  
 bash                            5.2.15-r0              apk     
-beautifulsoup4                  4.11.2                 python  
+beautifulsoup4                  4.12.2                 python  
-boto3                           1.26.87                python  
+boto3                           1.26.109               python  
-botocore                        1.29.87                python  
+botocore                        1.29.109               python  
 brotli-libs                     1.0.9-r9               apk     
 bs4                             0.0.1                  python  
 busybox                         1.35.0                 binary  
@@ -32,41 +32,42 @@ c-client                        2007f-r14              apk
 ca-certificates                 20220614-r4            apk     
 ca-certificates-bundle          20220614-r4            apk     
 cachetools                      5.3.0                  python  
-certbot                         2.4.0                  python  
+certbot                         2.5.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.4.0                  python  
+certbot-dns-cloudflare          2.5.0                  python  
 certbot-dns-cpanel              0.4.0                  python  
 certbot-dns-desec               1.2.1                  python  
-certbot-dns-digitalocean        2.4.0                  python  
+certbot-dns-digitalocean        2.5.0                  python  
 certbot-dns-directadmin         1.0.3                  python  
-certbot-dns-dnsimple            2.4.0                  python  
+certbot-dns-dnsimple            2.5.0                  python  
-certbot-dns-dnsmadeeasy         2.4.0                  python  
+certbot-dns-dnsmadeeasy         2.5.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.2.1                  python  
+certbot-dns-duckdns             1.3                    python  
 certbot-dns-dynu                0.0.4                  python  
-certbot-dns-gehirn              2.4.0                  python  
+certbot-dns-gehirn              2.5.0                  python  
 certbot-dns-godaddy             0.2.2                  python  
-certbot-dns-google              2.4.0                  python  
+certbot-dns-google              2.5.0                  python  
+certbot-dns-google-domains      0.1.9                  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.4.0                  python  
+certbot-dns-linode              2.5.0                  python  
 certbot-dns-loopia              1.0.1                  python  
-certbot-dns-luadns              2.4.0                  python  
+certbot-dns-luadns              2.5.0                  python  
 certbot-dns-netcup              1.2.0                  python  
 certbot-dns-njalla              1.0.0                  python  
-certbot-dns-nsone               2.4.0                  python  
+certbot-dns-nsone               2.5.0                  python  
-certbot-dns-ovh                 2.4.0                  python  
+certbot-dns-ovh                 2.5.0                  python  
-certbot-dns-porkbun             0.7                    python  
+certbot-dns-porkbun             0.8                    python  
-certbot-dns-rfc2136             2.4.0                  python  
+certbot-dns-rfc2136             2.5.0                  python  
-certbot-dns-route53             2.4.0                  python  
+certbot-dns-route53             2.5.0                  python  
-certbot-dns-sakuracloud         2.4.0                  python  
+certbot-dns-sakuracloud         2.5.0                  python  
 certbot-dns-standalone          1.1                    python  
 certbot-dns-transip             0.5.2                  python  
 certbot-dns-vultr               1.0.3                  python  
@@ -77,8 +78,9 @@ charset-normalizer              3.1.0                  python
 cloudflare                      2.11.1                 python  
 configobj                       5.0.8                  python  
 coreutils                       9.1-r0                 apk     
-cryptography                    39.0.2                 python  
+cryptography                    40.0.1                 python  
-curl                            7.88.1-r0              apk     
+curl                            7.88.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  
@@ -86,12 +88,13 @@ dnspython                       2.3.0                  python
 domeneshop                      0.4.3                  python  
 fail2ban                        1.0.2                  python  
 fail2ban                        1.0.2-r0               apk     
-filelock                        3.9.0                  python  
+filelock                        3.11.0                 python  
 fontconfig                      2.14.1-r0              apk     
 freetype                        2.12.1-r0              apk     
 future                          0.18.3                 python  
 gdbm                            1.23-r0                apk     
-git                             2.38.4-r0              apk     
+git                             2.38.4-r1              apk     
+git-perl                        2.38.4-r1              apk     
 gmp                             6.2.1-r2               apk     
 gnupg                           2.2.40-r0              apk     
 gnupg-dirmngr                   2.2.40-r0              apk     
@@ -100,20 +103,20 @@ gnupg-utils                     2.2.40-r0              apk
 gnupg-wks-client                2.2.40-r0              apk     
 gnutls                          3.7.8-r3               apk     
 google-api-core                 2.11.0                 python  
-google-api-python-client        2.80.0                 python  
+google-api-python-client        2.84.0                 python  
-google-auth                     2.16.2                 python  
+google-auth                     2.17.2                 python  
 google-auth-httplib2            0.1.0                  python  
-googleapis-common-protos        1.58.0                 python  
+googleapis-common-protos        1.59.0                 python  
 gpg                             2.2.40-r0              apk     
 gpg-agent                       2.2.40-r0              apk     
 gpg-wks-server                  2.2.40-r0              apk     
 gpgsm                           2.2.40-r0              apk     
 gpgv                            2.2.40-r0              apk     
-httplib2                        0.21.0                 python  
+httplib2                        0.22.0                 python  
 icu-data-en                     72.1-r1                apk     
 icu-libs                        72.1-r1                apk     
 idna                            3.4                    python  
-importlib-metadata              6.0.0                  python  
+importlib-metadata              6.2.0                  python  
 ip6tables                       1.8.8-r2               apk     
 iptables                        1.8.8-r2               apk     
 isodate                         0.6.1                  python  
@@ -129,8 +132,8 @@ libavif                         0.11.1-r0              apk
 libbsd                          0.11.7-r0              apk     
 libbz2                          1.0.8-r4               apk     
 libc-utils                      0.7.2-r3               apk     
-libcrypto3                      3.0.8-r0               apk     
+libcrypto3                      3.0.8-r3               apk     
-libcurl                         7.88.1-r0              apk     
+libcurl                         7.88.1-r1              apk     
 libdav1d                        1.0.0-r2               apk     
 libedit                         20221030.3.1-r0        apk     
 libevent                        2.1.12-r5              apk     
@@ -159,7 +162,7 @@ libsasl                         2.1.28-r3              apk
 libseccomp                      2.5.4-r0               apk     
 libsm                           1.2.3-r1               apk     
 libsodium                       1.0.18-r2              apk     
-libssl3                         3.0.8-r0               apk     
+libssl3                         3.0.8-r3               apk     
 libstdc++                       12.2.1_git20220924-r4  apk     
 libtasn1                        4.19.0-r0              apk     
 libunistring                    1.1-r0                 apk     
@@ -172,7 +175,7 @@ libxdmcp                        1.1.4-r0               apk
 libxext                         1.3.5-r0               apk     
 libxml2                         2.10.3-r1              apk     
 libxpm                          3.5.15-r0              apk     
-libxslt                         1.1.37-r0              apk     
+libxslt                         1.1.37-r1              apk     
 libxt                           1.2.1-r0               apk     
 libzip                          1.9.2-r2               apk     
 linux-pam                       1.5.2-r1               apk     
@@ -180,6 +183,8 @@ logrotate                       3.20.1-r3              apk
 loopialib                       0.2.0                  python  
 lxml                            4.9.2                  python  
 lz4-libs                        1.9.4-r1               apk     
+marshmallow                     3.19.0                 python  
+marshmallow-enum                1.5.1                  python  
 memcached                       1.6.17                 binary  
 memcached                       1.6.17-r0              apk     
 mock                            5.0.1                  python  
@@ -189,6 +194,7 @@ msal-extensions                 1.0.0                  python
 msrest                          0.7.1                  python  
 musl                            1.2.3-r4               apk     
 musl-utils                      1.2.3-r4               apk     
+mypy-extensions                 1.0.0                  python  
 nano                            7.0-r0                 apk     
 ncurses-libs                    6.3_p20221119-r0       apk     
 ncurses-terminfo-base           6.3_p20221119-r0       apk     
@@ -218,42 +224,45 @@ npth                            1.6-r2                 apk
 oauth2client                    4.1.3                  python  
 oauthlib                        3.2.2                  python  
 oniguruma                       6.9.8-r0               apk     
-openssl                         3.0.8-r0               apk     
+openssl                         3.0.8-r3               apk     
 p11-kit                         0.24.1-r1              apk     
+packaging                       23.0                   python  
 parsedatetime                   2.6                    python  
 pcre                            8.45-r2                apk     
 pcre2                           10.42-r0               apk     
 perl                            5.36.0-r0              apk     
-php-cli                         8.1.16                 binary  
+perl-error                      0.17029-r1             apk     
-php-fpm                         8.1.16                 binary  
+perl-git                        2.38.4-r1              apk     
-php81                           8.1.16-r0              apk     
+php-cli                         8.1.17                 binary  
-php81-bcmath                    8.1.16-r0              apk     
+php-fpm                         8.1.17                 binary  
-php81-bz2                       8.1.16-r0              apk     
+php81                           8.1.17-r0              apk     
-php81-common                    8.1.16-r0              apk     
+php81-bcmath                    8.1.17-r0              apk     
-php81-ctype                     8.1.16-r0              apk     
+php81-bz2                       8.1.17-r0              apk     
-php81-curl                      8.1.16-r0              apk     
+php81-common                    8.1.17-r0              apk     
-php81-dom                       8.1.16-r0              apk     
+php81-ctype                     8.1.17-r0              apk     
-php81-exif                      8.1.16-r0              apk     
+php81-curl                      8.1.17-r0              apk     
-php81-fileinfo                  8.1.16-r0              apk     
+php81-dom                       8.1.17-r0              apk     
-php81-fpm                       8.1.16-r0              apk     
+php81-exif                      8.1.17-r0              apk     
-php81-ftp                       8.1.16-r0              apk     
+php81-fileinfo                  8.1.17-r0              apk     
-php81-gd                        8.1.16-r0              apk     
+php81-fpm                       8.1.17-r0              apk     
-php81-gmp                       8.1.16-r0              apk     
+php81-ftp                       8.1.17-r0              apk     
-php81-iconv                     8.1.16-r0              apk     
+php81-gd                        8.1.17-r0              apk     
-php81-imap                      8.1.16-r0              apk     
+php81-gmp                       8.1.17-r0              apk     
-php81-intl                      8.1.16-r0              apk     
+php81-iconv                     8.1.17-r0              apk     
-php81-ldap                      8.1.16-r0              apk     
+php81-imap                      8.1.17-r0              apk     
-php81-mbstring                  8.1.16-r0              apk     
+php81-intl                      8.1.17-r0              apk     
-php81-mysqli                    8.1.16-r0              apk     
+php81-ldap                      8.1.17-r0              apk     
-php81-mysqlnd                   8.1.16-r0              apk     
+php81-mbstring                  8.1.17-r0              apk     
-php81-opcache                   8.1.16-r0              apk     
+php81-mysqli                    8.1.17-r0              apk     
-php81-openssl                   8.1.16-r0              apk     
+php81-mysqlnd                   8.1.17-r0              apk     
-php81-pdo                       8.1.16-r0              apk     
+php81-opcache                   8.1.17-r0              apk     
-php81-pdo_mysql                 8.1.16-r0              apk     
+php81-openssl                   8.1.17-r0              apk     
-php81-pdo_odbc                  8.1.16-r0              apk     
+php81-pdo                       8.1.17-r0              apk     
-php81-pdo_pgsql                 8.1.16-r0              apk     
+php81-pdo_mysql                 8.1.17-r0              apk     
-php81-pdo_sqlite                8.1.16-r0              apk     
+php81-pdo_odbc                  8.1.17-r0              apk     
-php81-pear                      8.1.16-r0              apk     
+php81-pdo_pgsql                 8.1.17-r0              apk     
+php81-pdo_sqlite                8.1.17-r0              apk     
+php81-pear                      8.1.17-r0              apk     
 php81-pecl-apcu                 5.1.22-r0              apk     
 php81-pecl-igbinary             3.2.12-r0              apk     
 php81-pecl-mailparse            3.1.4-r0               apk     
@@ -261,21 +270,21 @@ php81-pecl-mcrypt               1.0.6-r0               apk
 php81-pecl-memcached            3.2.0-r0               apk     
 php81-pecl-redis                5.3.7-r0               apk     
 php81-pecl-xmlrpc               1.0.0_rc3-r0           apk     
-php81-pgsql                     8.1.16-r0              apk     
+php81-pgsql                     8.1.17-r0              apk     
-php81-phar                      8.1.16-r0              apk     
+php81-phar                      8.1.17-r0              apk     
-php81-posix                     8.1.16-r0              apk     
+php81-posix                     8.1.17-r0              apk     
-php81-session                   8.1.16-r0              apk     
+php81-session                   8.1.17-r0              apk     
-php81-simplexml                 8.1.16-r0              apk     
+php81-simplexml                 8.1.17-r0              apk     
-php81-soap                      8.1.16-r0              apk     
+php81-soap                      8.1.17-r0              apk     
-php81-sockets                   8.1.16-r0              apk     
+php81-sockets                   8.1.17-r0              apk     
-php81-sodium                    8.1.16-r0              apk     
+php81-sodium                    8.1.17-r0              apk     
-php81-sqlite3                   8.1.16-r0              apk     
+php81-sqlite3                   8.1.17-r0              apk     
-php81-tokenizer                 8.1.16-r0              apk     
+php81-tokenizer                 8.1.17-r0              apk     
-php81-xml                       8.1.16-r0              apk     
+php81-xml                       8.1.17-r0              apk     
-php81-xmlreader                 8.1.16-r0              apk     
+php81-xmlreader                 8.1.17-r0              apk     
-php81-xmlwriter                 8.1.16-r0              apk     
+php81-xmlwriter                 8.1.17-r0              apk     
-php81-xsl                       8.1.16-r0              apk     
+php81-xsl                       8.1.17-r0              apk     
-php81-zip                       8.1.16-r0              apk     
+php81-zip                       8.1.17-r0              apk     
 pinentry                        1.2.1-r0               apk     
 pip                             23.0.1                 python  
 pkb-client                      1.2                    python  
@@ -283,19 +292,20 @@ popt                            1.19-r0                apk
 portalocker                     2.7.0                  python  
 procps                          3.3.17-r2              apk     
 protobuf                        4.22.1                 python  
-pyOpenSSL                       23.0.0                 python  
+publicsuffixlist                0.9.3                  python  
+pyOpenSSL                       23.1.1                 python  
 pyRFC3339                       1.1                    python  
 pyacmedns                       0.4                    python  
 pyasn1                          0.4.8                  python  
 pyasn1-modules                  0.2.8                  python  
 pycparser                       2.21                   python  
 pyparsing                       3.0.9                  python  
-python                          3.10.10                binary  
+python                          3.10.11                binary  
 python-dateutil                 2.8.2                  python  
 python-digitalocean             1.17.0                 python  
 python-transip                  0.6.0                  python  
-python3                         3.10.10-r0             apk     
+python3                         3.10.11-r0             apk     
-pytz                            2022.7.1               python  
+pytz                            2023.3                 python  
 readline                        8.2.0-r0               apk     
 requests                        2.28.2                 python  
 requests-file                   1.5.1                  python  
@@ -311,19 +321,20 @@ skalibs                         2.12.0.1-r0            apk
 soupsieve                       2.4                    python  
 sqlite-libs                     3.40.1-r0              apk     
 ssl_client                      1.35.0-r29             apk     
-tiff                            4.4.0-r1               apk     
+tiff                            4.4.0-r3               apk     
 tldextract                      3.4.0                  python  
+typing-inspect                  0.8.0                  python  
 typing_extensions               4.5.0                  python  
-tzdata                          2022f-r1               apk     
+tzdata                          2023c-r0               apk     
 unixodbc                        2.3.11-r0              apk     
 uritemplate                     4.1.1                  python  
-urllib3                         1.26.14                python  
+urllib3                         1.26.15                python  
 utmps-libs                      0.1.2.0-r1             apk     
-wheel                           0.38.4                 python  
+wheel                           0.40.0                 python  
 whois                           5.5.14-r0              apk     
 xz                              5.2.9-r0               apk     
 xz-libs                         5.2.9-r0               apk     
 zipp                            3.15.0                 python  
 zlib                            1.2.13-r0              apk     
-zope.interface                  5.5.2                  python  
+zope.interface                  6.0                    python  
-zstd-libs                       1.5.2-r9               apk     
+zstd-libs                       1.5.5-r0               apk     

readme-vars.yml

@@ -51,7 +51,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`, `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`, `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: "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`" }
@@ -154,6 +154,9 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "25.03.23:", desc: "Fix renewal post hook." }
+  - { date: "10.03.23:", desc: "Cleanup unused csr and keys folders. See [certbot 2.3.0 release notes](https://github.com/certbot/certbot/releases/tag/v2.3.0)." }
+  - { date: "09.03.23:", desc: "Add Google Domains DNS support, `google-domains`." }
   - { date: "02.03.23:", desc: "Set permissions on crontabs during init." }
   - { date: "09.02.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf, authelia-location.conf and authelia-server.conf - Add Authentik configs, update Authelia configs." }
   - { date: "06.02.23:", desc: "Add porkbun support back in." }

root/defaults/dns-conf/google-domains.ini

@@ -0,0 +1,4 @@
+# Instructions: https://github.com/aaomidi/certbot-dns-google-domains#credentials
+# Replace with your value
+dns_google_domains_access_token = abcdef
+dns_google_domains_zone = example.com

root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx

@@ -5,7 +5,7 @@
 . /config/.donoteditthisfile.conf
 
 if [[ ! "${ORIGVALIDATION}" = "dns" ]] && [[ ! "${ORIGVALIDATION}" = "duckdns" ]]; then
-    if pgrep -f "s6-supervise nginx" >/dev/null; then
+    if pgrep -f "s6-supervise svc-nginx" >/dev/null; then
         s6-svc -u /run/service/svc-nginx
     fi
 else

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

@@ -1,6 +1,6 @@
 ## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-location.conf.sample
 # Make sure that your authelia container is in the same user defined bridge network and is named authelia
-# Rename /config/nginx/proxy-confs/authelia.conf.sample to /config/nginx/proxy-confs/authelia.conf
+# Rename /config/nginx/proxy-confs/authelia.subdomain.conf.sample to /config/nginx/proxy-confs/authelia.subdomain.conf
 # Make sure that the authelia configuration.yml has 'path: "authelia"' defined
 
 ## Send a subrequest to Authelia to verify if the user is authenticated and has permission to access the resource.

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

@@ -1,6 +1,6 @@
 ## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-server.conf.sample
 # Make sure that your authelia container is in the same user defined bridge network and is named authelia
-# Rename /config/nginx/proxy-confs/authelia.conf.sample to /config/nginx/proxy-confs/authelia.conf
+# Rename /config/nginx/proxy-confs/authelia.subdomain.conf.sample to /config/nginx/proxy-confs/authelia.subdomain.conf
 # Make sure that the authelia configuration.yml has 'path: "authelia"' defined
 
 # location for authelia subfolder requests

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

@@ -1,6 +1,6 @@
 ## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-location.conf.sample
 # Make sure that your authentik container is in the same user defined bridge network and is named authentik-server
-# Rename /config/nginx/proxy-confs/authentik.conf.sample to /config/nginx/proxy-confs/authentik.conf
+# Rename /config/nginx/proxy-confs/authentik.subdomain.conf.sample to /config/nginx/proxy-confs/authentik.subdomain.conf
 
 ## Send a subrequest to Authentik to verify if the user is authenticated and has permission to access the resource.
 auth_request /outpost.goauthentik.io/auth/nginx;

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

@@ -1,6 +1,6 @@
 ## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-server.conf.sample
 # Make sure that your authentik container is in the same user defined bridge network and is named authentik-server
-# Rename /config/nginx/proxy-confs/authentik.conf.sample to /config/nginx/proxy-confs/authentik.conf
+# Rename /config/nginx/proxy-confs/authentik.subdomain.conf.sample to /config/nginx/proxy-confs/authentik.subdomain.conf
 
 # location for authentik subfolder requests
 location ^~ /outpost.goauthentik.io {

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

@@ -24,7 +24,7 @@ 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|he|hetzner|infomaniak|inwx|ionos|linode|loopia|luadns|netcup|njalla|nsone|ovh|porkbun|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]]; then
+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."
     sleep infinity
 fi
@@ -41,6 +41,7 @@ lsiown -R abc:abc /config/etc/letsencrypt/renewal-hooks
 # replace nginx service location in renewal hooks
 find /config/etc/letsencrypt/renewal-hooks/ -type f -exec sed -i 's|/run/service/nginx|/run/service/svc-nginx|g' {} \;
 find /config/etc/letsencrypt/renewal-hooks/ -type f -exec sed -i 's|/var/run/s6/services/nginx|/run/service/svc-nginx|g' {} \;
+find /config/etc/letsencrypt/renewal-hooks/ -type f -exec sed -i 's|s6-supervise nginx|s6-supervise svc-nginx|g' {} \;
 
 # create original config file if it doesn't exist, move non-hidden legacy file to hidden
 if [[ -f "/config/donoteditthisfile.conf" ]]; then
@@ -140,6 +141,10 @@ else
     ln -s ../etc/letsencrypt/live/"${URL}" /config/keys/letsencrypt
 fi
 
+# cleanup unused csr and keys folders
+rm -rf /etc/letsencrypt/csr
+rm -rf /etc/letsencrypt/keys
+
 # checking for changes in cert variables, revoking certs if necessary
 if [[ ! "${URL}" = "${ORIGURL}" ]] ||
     [[ ! "${SUBDOMAINS}" = "${ORIGSUBDOMAINS}" ]] ||
@@ -269,7 +274,7 @@ if [[ "${VALIDATION}" = "dns" ]]; then
         DNSCREDENTIALSPARAM=""
     fi
     # plugins that don't support setting propagation
-    if [[ "${DNSPLUGIN}" =~ ^(azure|gandi|standalone)$ ]]; then
+    if [[ "${DNSPLUGIN}" =~ ^(azure|gandi|route53|standalone)$ ]]; then
         if [[ -n "${PROPAGATION}" ]]; then echo "${DNSPLUGIN} dns plugin does not support setting propagation time"; fi
         PROPAGATIONPARAM=""
     fi