Merge pull request #415 from linuxserver/2.7-fix

Fix "unrecognized arguments" issue in DirectAdmin DNS plugin

README.md

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

package_versions.txt

@@ -4,7 +4,7 @@ PyJWT                           2.8.0                   python
 PyNamecheap                     0.0.3                   python  
 PyYAML                          6.0.1                   python  
 Simple Launcher Executable      1.1.0.14                dotnet  
-acme                            2.6.0                   python  
+acme                            2.7.0                   python  
 alpine-baselayout               3.4.3-r1                apk     
 alpine-baselayout-data          3.4.3-r1                apk     
 alpine-keys                     2.4-r1                  apk     
@@ -23,8 +23,8 @@ azure-mgmt-core                 1.4.0                   python
 azure-mgmt-dns                  8.1.0                   python  
 bash                            5.2.15-r5               apk     
 beautifulsoup4                  4.12.2                  python  
-boto3                           1.28.57                 python  
+boto3                           1.28.59                 python  
-botocore                        1.31.57                 python  
+botocore                        1.31.59                 python  
 brotli-libs                     1.0.9-r14               apk     
 bs4                             0.0.1                   python  
 busybox                         1.36.1-r2               apk     
@@ -33,15 +33,15 @@ 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                         2.7.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.6.0                   python  
+certbot-dns-cloudflare          2.7.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-digitalocean        2.7.0                   python  
 certbot-dns-directadmin         1.0.3                   python  
 certbot-dns-dnsimple            2.6.0                   python  
 certbot-dns-dnsmadeeasy         2.6.0                   python  
@@ -53,8 +53,8 @@ certbot-dns-duckdns             1.3                     python
 certbot-dns-dynu                0.0.4                   python  
 certbot-dns-freedns             0.1.0                   python  
 certbot-dns-gehirn              2.6.0                   python  
-certbot-dns-godaddy             2.6.0                   python  
+certbot-dns-godaddy             0.2.2                   python  
-certbot-dns-google              2.6.0                   python  
+certbot-dns-google              2.7.0                   python  
 certbot-dns-google-domains      0.1.11                  python  
 certbot-dns-he                  1.0.0                   python  
 certbot-dns-hetzner             2.0.0                   python  
@@ -70,8 +70,8 @@ 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-rfc2136             2.7.0                   python  
-certbot-dns-route53             2.6.0                   python  
+certbot-dns-route53             2.7.0                   python  
 certbot-dns-sakuracloud         2.6.0                   python  
 certbot-dns-standalone          1.1                     python  
 certbot-dns-transip             0.5.2                   python  
@@ -79,7 +79,7 @@ certbot-dns-vultr               1.1.0                   python
 certbot-plugin-gandi            1.4.3                   python  
 certifi                         2023.7.22               python  
 cffi                            1.16.0                  python  
-charset-normalizer              3.2.0                   python  
+charset-normalizer              3.3.0                   python  
 cloudflare                      2.12.4                  python  
 configobj                       5.0.8                   python  
 coreutils                       9.3-r1                  apk     
@@ -229,7 +229,7 @@ npth                            1.6-r4                  apk
 oniguruma                       6.9.8-r1                apk     
 openssl                         3.1.3-r0                apk     
 p11-kit                         0.24.1-r2               apk     
-packaging                       23.1                    python  
+packaging                       23.2                    python  
 parsedatetime                   2.6                     python  
 pcre                            8.45-r3                 apk     
 pcre2                           10.42-r1                apk     
@@ -329,7 +329,7 @@ typing_extensions               4.8.0                   python
 tzdata                          2023c-r1                apk     
 unixodbc                        2.3.11-r2               apk     
 uritemplate                     4.1.1                   python  
-urllib3                         1.26.16                 python  
+urllib3                         1.26.17                 python  
 utmps-libs                      0.1.2.1-r1              apk     
 wheel                           0.41.2                  python  
 whois                           5.5.17-r0               apk     

readme-vars.yml

@@ -153,6 +153,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { 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." }

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
-CERTBOT_DNS_AUTHENTICATORS=$(certbot plugins --authenticators 2>/dev/null | sed -e 's/^Entry point: cpanel =/Entry point: dns-cpanel =/' -e '/^Entry point: dns-/!d' -e 's/^Entry point: dns-\([^ ]*\) =.*/\1/' | sort)
+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}"
@@ -304,7 +304,7 @@ if [[ "${VALIDATION}" = "dns" ]]; then
         sed -i "/^dns-${DNSPLUGIN}-propagation-seconds\b/d" /config/etc/letsencrypt/cli.ini
     fi
     # plugins that use old parameter naming convention
-    if [[ "${DNSPLUGIN}" =~ ^(cpanel|directadmin)$ ]]; then
+    if [[ "${DNSPLUGIN}" =~ ^(cpanel)$ ]]; then
         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