Adds dnsapi support for Simply.com

.github/FUNDING.yml

@@ -3,7 +3,7 @@
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: acmesh
-ko_fi: neilpang
+ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username

.github/auto-comment.yml

@@ -0,0 +1,40 @@
+# Comment to a new issue.
+issuesOpened: >
+  If this is a bug report, please upgrade to the latest code and try again:
+  
+  如果有 bug, 请先更新到最新版试试:
+  
+  ```
+  acme.sh --upgrade
+  ```
+  
+  please also provide the log with `--debug 2`.
+  
+  同时请提供调试输出 `--debug 2`
+  
+  see: https://github.com/acmesh-official/acme.sh/wiki/How-to-debug-acme.sh
+  
+  Without `--debug 2` log, your issue will NEVER get replied.
+  
+  没有调试输出, 你的 issue 不会得到任何解答.
+
+
+pullRequestOpened: >
+  First, NEVER send a PR to `master` branch, it will NEVER be accepted. Please send to the `dev` branch instead.
+  
+  If this is a PR to support new DNS API or new notification API, please read this guide first:
+  https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Dev-Guide
+  
+  Please check the guide items one by one.
+  
+  Then add your usage here:
+  https://github.com/acmesh-official/acme.sh/wiki/dnsapi
+   
+  Or some other wiki pages:
+  
+  https://github.com/acmesh-official/acme.sh/wiki/deployhooks
+  
+  https://github.com/acmesh-official/acme.sh/wiki/notify
+  
+
+

.github/workflows/DNS.yml

@@ -1,515 +1,211 @@
-name: DNS
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - 'dnsapi/*.sh'
-      - '.github/workflows/DNS.yml'
-  pull_request:
-    branches:
-      - 'dev'
-    paths:
-      - 'dnsapi/*.sh'
-      - '.github/workflows/DNS.yml'
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  CheckToken:
-    runs-on: ubuntu-latest
-    outputs:
-      hasToken: ${{ steps.step_one.outputs.hasToken }}
-    steps:
-      - name: Set the value
-        id: step_one
-        run: |
-          if [ "${{secrets.TokenName1}}" ] ; then
-            echo "::set-output name=hasToken::true"
-          else
-            echo "::set-output name=hasToken::false"
-          fi
-      - name: Check the value
-        run: echo ${{ steps.step_one.outputs.hasToken }}
-
-  Fail:
-    runs-on: ubuntu-latest
-    needs: CheckToken
-    if: "contains(needs.CheckToken.outputs.hasToken, 'false')"
-    steps:
-    - name: "Read this:   https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Test"
-      run: |
-        echo "Read this:   https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Test"
-        if [ "${{github.repository_owner}}" != "acmesh-official" ]; then
-          false
-        fi
-
-  Docker:
-    runs-on: ubuntu-latest
-    needs: CheckToken
-    if: "contains(needs.CheckToken.outputs.hasToken, 'true')"
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: ${{ secrets.DEBUG }}
-      http_proxy: ${{ secrets.http_proxy }}
-      https_proxy: ${{ secrets.https_proxy }}
-      TokenName1: ${{ secrets.TokenName1}}
-      TokenName2: ${{ secrets.TokenName2}}
-      TokenName3: ${{ secrets.TokenName3}}
-      TokenName4: ${{ secrets.TokenName4}}
-      TokenName5: ${{ secrets.TokenName5}}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - name: Set env file
-      run: |
-        cd ../acmetest
-        if [ "${{ secrets.TokenName1}}" ] ; then
-          echo "${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}" >> docker.env
-        fi
-        if [ "${{ secrets.TokenName2}}" ] ; then
-          echo "${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}" >> docker.env
-        fi
-        if [ "${{ secrets.TokenName3}}" ] ; then
-          echo "${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}" >> docker.env
-        fi
-        if [ "${{ secrets.TokenName4}}" ] ; then
-          echo "${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}" >> docker.env
-        fi
-        if [ "${{ secrets.TokenName5}}" ] ; then
-          echo "${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}" >> docker.env
-        fi
-
-    - name: Run acmetest
-      run: cd ../acmetest && ./rundocker.sh  testall
-
-
-
-
-  MacOS:
-    runs-on: macos-latest
-    needs: Docker
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: ${{ secrets.DEBUG }}
-      http_proxy: ${{ secrets.http_proxy }}
-      https_proxy: ${{ secrets.https_proxy }}
-      TokenName1: ${{ secrets.TokenName1}}
-      TokenName2: ${{ secrets.TokenName2}}
-      TokenName3: ${{ secrets.TokenName3}}
-      TokenName4: ${{ secrets.TokenName4}}
-      TokenName5: ${{ secrets.TokenName5}}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install tools
-      run:  brew install socat
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - name: Run acmetest
-      run: |
-        if [ "${{ secrets.TokenName1}}" ] ; then
-          export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
-        fi
-        if [ "${{ secrets.TokenName2}}" ] ; then
-          export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
-        fi
-        if [ "${{ secrets.TokenName3}}" ] ; then
-          export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
-        fi
-        if [ "${{ secrets.TokenName4}}" ] ; then
-          export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
-        fi
-        if [ "${{ secrets.TokenName5}}" ] ; then
-          export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
-        fi
-        cd ../acmetest
-        ./letest.sh
-
-
-
-
-  Windows:
-    runs-on: windows-latest
-    needs: MacOS
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: ${{ secrets.DEBUG }}
-      http_proxy: ${{ secrets.http_proxy }}
-      https_proxy: ${{ secrets.https_proxy }}
-      TokenName1: ${{ secrets.TokenName1}}
-      TokenName2: ${{ secrets.TokenName2}}
-      TokenName3: ${{ secrets.TokenName3}}
-      TokenName4: ${{ secrets.TokenName4}}
-      TokenName5: ${{ secrets.TokenName5}}
-    steps:
-    - name: Set git to use LF
-      run: |
-          git config --global core.autocrlf false
-    - uses: actions/checkout@v4
-    - name: Install cygwin base packages with chocolatey
-      run: |
-          choco config get cacheLocation
-          choco install --no-progress cygwin
-      shell: cmd
-    - name: Install cygwin additional packages
-      run: |
-          C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -s https://mirrors.kernel.org/sourceware/cygwin/ -P socat,curl,cron,unzip,git
-      shell: cmd
-    - name: Set ENV
-      shell: cmd
-      run: |
-          echo PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin >> %GITHUB_ENV%
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - name: Run acmetest
-      shell: bash
-      run: |
-        if [ "${{ secrets.TokenName1}}" ] ; then
-          export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
-        fi
-        if [ "${{ secrets.TokenName2}}" ] ; then
-          export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
-        fi
-        if [ "${{ secrets.TokenName3}}" ] ; then
-          export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
-        fi
-        if [ "${{ secrets.TokenName4}}" ] ; then
-          export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
-        fi
-        if [ "${{ secrets.TokenName5}}" ] ; then
-          export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
-        fi
-        cd ../acmetest
-        ./letest.sh
-
-
-
-  FreeBSD:
-    runs-on: ubuntu-latest
-    needs: Windows
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: ${{ secrets.DEBUG }}
-      http_proxy: ${{ secrets.http_proxy }}
-      https_proxy: ${{ secrets.https_proxy }}
-      TokenName1: ${{ secrets.TokenName1}}
-      TokenName2: ${{ secrets.TokenName2}}
-      TokenName3: ${{ secrets.TokenName3}}
-      TokenName4: ${{ secrets.TokenName4}}
-      TokenName5: ${{ secrets.TokenName5}}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/freebsd-vm@v1
-      with:
-        envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
-        prepare: pkg install -y socat curl
-        usesh: true
-        copyback: false
-        run: |
-          if [ "${{ secrets.TokenName1}}" ] ; then
-            export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
-          fi
-          if [ "${{ secrets.TokenName2}}" ] ; then
-            export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
-          fi
-          if [ "${{ secrets.TokenName3}}" ] ; then
-            export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
-          fi
-          if [ "${{ secrets.TokenName4}}" ] ; then
-            export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
-          fi
-          if [ "${{ secrets.TokenName5}}" ] ; then
-            export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
-          fi
-          cd ../acmetest
-          ./letest.sh
-
-
-
-
-  OpenBSD:
-    runs-on: ubuntu-latest
-    needs: FreeBSD
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: ${{ secrets.DEBUG }}
-      http_proxy: ${{ secrets.http_proxy }}
-      https_proxy: ${{ secrets.https_proxy }}
-      TokenName1: ${{ secrets.TokenName1}}
-      TokenName2: ${{ secrets.TokenName2}}
-      TokenName3: ${{ secrets.TokenName3}}
-      TokenName4: ${{ secrets.TokenName4}}
-      TokenName5: ${{ secrets.TokenName5}}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/openbsd-vm@v1
-      with:
-        envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
-        prepare: pkg_add socat curl libiconv
-        usesh: true
-        copyback: false
-        run: |
-          if [ "${{ secrets.TokenName1}}" ] ; then
-            export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
-          fi
-          if [ "${{ secrets.TokenName2}}" ] ; then
-            export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
-          fi
-          if [ "${{ secrets.TokenName3}}" ] ; then
-            export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
-          fi
-          if [ "${{ secrets.TokenName4}}" ] ; then
-            export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
-          fi
-          if [ "${{ secrets.TokenName5}}" ] ; then
-            export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
-          fi
-          cd ../acmetest
-          ./letest.sh
-
-
-
-
-  NetBSD:
-    runs-on: ubuntu-latest
-    needs: OpenBSD
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: ${{ secrets.DEBUG }}
-      http_proxy: ${{ secrets.http_proxy }}
-      https_proxy: ${{ secrets.https_proxy }}
-      TokenName1: ${{ secrets.TokenName1}}
-      TokenName2: ${{ secrets.TokenName2}}
-      TokenName3: ${{ secrets.TokenName3}}
-      TokenName4: ${{ secrets.TokenName4}}
-      TokenName5: ${{ secrets.TokenName5}}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/netbsd-vm@v1
-      with:
-        envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
-        prepare: |
-          /usr/sbin/pkg_add curl socat
-        usesh: true
-        copyback: false
-        run: |
-          if [ "${{ secrets.TokenName1}}" ] ; then
-            export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
-          fi
-          if [ "${{ secrets.TokenName2}}" ] ; then
-            export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
-          fi
-          if [ "${{ secrets.TokenName3}}" ] ; then
-            export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
-          fi
-          if [ "${{ secrets.TokenName4}}" ] ; then
-            export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
-          fi
-          if [ "${{ secrets.TokenName5}}" ] ; then
-            export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
-          fi
-          cd ../acmetest
-          ./letest.sh
-
-
-
-
-  DragonFlyBSD:
-    runs-on: ubuntu-latest
-    needs: NetBSD
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: ${{ secrets.DEBUG }}
-      http_proxy: ${{ secrets.http_proxy }}
-      https_proxy: ${{ secrets.https_proxy }}
-      TokenName1: ${{ secrets.TokenName1}}
-      TokenName2: ${{ secrets.TokenName2}}
-      TokenName3: ${{ secrets.TokenName3}}
-      TokenName4: ${{ secrets.TokenName4}}
-      TokenName5: ${{ secrets.TokenName5}}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/dragonflybsd-vm@v1
-      with:
-        envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
-        prepare: |
-          pkg install -y curl socat libnghttp2
-        usesh: true
-        copyback: false
-        run: |
-          if [ "${{ secrets.TokenName1}}" ] ; then
-            export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
-          fi
-          if [ "${{ secrets.TokenName2}}" ] ; then
-            export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
-          fi
-          if [ "${{ secrets.TokenName3}}" ] ; then
-            export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
-          fi
-          if [ "${{ secrets.TokenName4}}" ] ; then
-            export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
-          fi
-          if [ "${{ secrets.TokenName5}}" ] ; then
-            export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
-          fi
-          cd ../acmetest
-          ./letest.sh
-
-
-
-
-
-
-
-  Solaris:
-    runs-on: ubuntu-latest
-    needs: DragonFlyBSD
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: ${{ secrets.DEBUG }}
-      http_proxy: ${{ secrets.http_proxy }}
-      https_proxy: ${{ secrets.https_proxy }}
-      HTTPS_INSECURE: 1 # always set to 1 to ignore https error, since Solaris doesn't accept the expired ISRG X1 root
-      TokenName1: ${{ secrets.TokenName1}}
-      TokenName2: ${{ secrets.TokenName2}}
-      TokenName3: ${{ secrets.TokenName3}}
-      TokenName4: ${{ secrets.TokenName4}}
-      TokenName5: ${{ secrets.TokenName5}}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/solaris-vm@v1
-      with:
-        envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy HTTPS_INSECURE TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
-        copyback: false
-        prepare: pkgutil -y -i socat
-        run: |
-          pkg set-mediator -v -I default@1.1 openssl
-          export PATH=/usr/gnu/bin:$PATH
-          if [ "${{ secrets.TokenName1}}" ] ; then
-            export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
-          fi
-          if [ "${{ secrets.TokenName2}}" ] ; then
-            export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
-          fi
-          if [ "${{ secrets.TokenName3}}" ] ; then
-            export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
-          fi
-          if [ "${{ secrets.TokenName4}}" ] ; then
-            export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
-          fi
-          if [ "${{ secrets.TokenName5}}" ] ; then
-            export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
-          fi
-          cd ../acmetest
-          ./letest.sh
-
-
-  Omnios:
-    runs-on: ubuntu-latest
-    needs: Solaris
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: ${{ secrets.DEBUG }}
-      http_proxy: ${{ secrets.http_proxy }}
-      https_proxy: ${{ secrets.https_proxy }}
-      HTTPS_INSECURE: 1 # always set to 1 to ignore https error, since Omnios doesn't accept the expired ISRG X1 root
-      TokenName1: ${{ secrets.TokenName1}}
-      TokenName2: ${{ secrets.TokenName2}}
-      TokenName3: ${{ secrets.TokenName3}}
-      TokenName4: ${{ secrets.TokenName4}}
-      TokenName5: ${{ secrets.TokenName5}}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/omnios-vm@v1
-      with:
-        envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy HTTPS_INSECURE TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
-        copyback: false
-        prepare: pkg install socat
-        run: |
-          if [ "${{ secrets.TokenName1}}" ] ; then
-            export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
-          fi
-          if [ "${{ secrets.TokenName2}}" ] ; then
-            export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
-          fi
-          if [ "${{ secrets.TokenName3}}" ] ; then
-            export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
-          fi
-          if [ "${{ secrets.TokenName4}}" ] ; then
-            export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
-          fi
-          if [ "${{ secrets.TokenName5}}" ] ; then
-            export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
-          fi
-          cd ../acmetest
-          ./letest.sh
-
-
+name: DNS
+on:
+  push:
+    branches:
+      - 'dev'
+    paths:
+      - 'dnsapi/*.sh'
+      - '.github/workflows/DNS.yml'
+  pull_request:
+    branches:
+      - 'dev'
+    paths:
+      - 'dnsapi/*.sh'
+      - '.github/workflows/DNS.yml'
+
+
+jobs:
+  CheckToken:
+    runs-on: ubuntu-latest
+    outputs:
+      hasToken: ${{ steps.step_one.outputs.hasToken }}
+    steps:
+      - name: Set the value
+        id: step_one
+        run: |
+          if [ "${{secrets.TokenName1}}" ] ; then
+            echo "::set-output name=hasToken::true"
+          else
+            echo "::set-output name=hasToken::false"
+          fi
+      - name: Check the value
+        run: echo ${{ steps.step_one.outputs.hasToken }}
+
+  Fail:
+    runs-on: ubuntu-latest
+    needs: CheckToken
+    if: "contains(needs.CheckToken.outputs.hasToken, 'false')"
+    steps:
+    - name: "Read this:   https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Test"
+      run: |
+        echo "Plese see this page to fix the error: https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Test"
+    - name: Fail
+      if: "github.actor != 'Neilpang'"
+      run: false
+
+  Docker:
+    runs-on: ubuntu-latest
+    needs: CheckToken
+    if: "contains(needs.CheckToken.outputs.hasToken, 'true')"
+    env:
+      TEST_DNS : ${{ secrets.TEST_DNS }}
+      TestingDomain: ${{ secrets.TestingDomain }}
+      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
+      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
+      CASE: le_test_dnsapi
+      TEST_LOCAL: 1
+      DEBUG: 1
+    steps:
+    - uses: actions/checkout@v2
+    - name: Clone acmetest
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
+    - name: Set env file
+      run: |
+        cd ../acmetest 
+        if [ "${{ secrets.TokenName1}}" ] ; then
+          echo "${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}" >> env.list
+        fi
+        if [ "${{ secrets.TokenName2}}" ] ; then
+          echo "${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}" >> env.list
+        fi
+        if [ "${{ secrets.TokenName3}}" ] ; then
+          echo "${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}" >> env.list
+        fi
+        if [ "${{ secrets.TokenName4}}" ] ; then
+          echo "${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}" >> env.list
+        fi
+        if [ "${{ secrets.TokenName5}}" ] ; then
+          echo "${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}" >> env.list
+        fi
+        echo "TEST_DNS_NO_WILDCARD" >> env.list 
+        echo "TEST_DNS_SLEEP" >> env.list
+    - name: Run acmetest
+      run: cd ../acmetest && ./rundocker.sh  testall
+
+  MacOS:
+    runs-on: macos-latest
+    needs: Docker
+    env:
+      TEST_DNS : ${{ secrets.TEST_DNS }}
+      TestingDomain: ${{ secrets.TestingDomain }}
+      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
+      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
+      CASE: le_test_dnsapi
+      TEST_LOCAL: 1
+      DEBUG: 1
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install tools
+      run:  brew install socat
+    - name: Clone acmetest
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
+    - name: Run acmetest
+      run: |
+        if [ "${{ secrets.TokenName1}}" ] ; then
+          export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
+        fi
+        if [ "${{ secrets.TokenName2}}" ] ; then
+          export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
+        fi
+        if [ "${{ secrets.TokenName3}}" ] ; then
+          export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
+        fi
+        if [ "${{ secrets.TokenName4}}" ] ; then
+          export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
+        fi
+        if [ "${{ secrets.TokenName5}}" ] ; then
+          export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
+        fi
+        cd ../acmetest
+        ./letest.sh
+
+  Windows:
+    runs-on: windows-latest
+    needs: MacOS
+    env:
+      TEST_DNS : ${{ secrets.TEST_DNS }}
+      TestingDomain: ${{ secrets.TestingDomain }}
+      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
+      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
+      CASE: le_test_dnsapi
+      TEST_LOCAL: 1
+      DEBUG: 1
+    steps:
+    - name: Set git to use LF
+      run: |
+          git config --global core.autocrlf false
+    - uses: actions/checkout@v2
+    - name: Install cygwin base packages with chocolatey
+      run: |
+          choco config get cacheLocation
+          choco install --no-progress cygwin
+      shell: cmd
+    - name: Install cygwin additional packages
+      run: |
+          C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -s http://mirrors.kernel.org/sourceware/cygwin/ -P socat,curl,cron,unzip,git
+      shell: cmd
+    - name: Set ENV
+      shell: cmd
+      run: |
+          echo PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin >> %GITHUB_ENV%
+    - name: Clone acmetest
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
+    - name: Run acmetest
+      shell: cmd
+      run: |
+        if [ "${{ secrets.TokenName1}}" ] ; then
+          set ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
+        fi
+        if [ "${{ secrets.TokenName2}}" ] ; then
+          set ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
+        fi
+        if [ "${{ secrets.TokenName3}}" ] ; then
+          set ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
+        fi
+        if [ "${{ secrets.TokenName4}}" ] ; then
+          set ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
+        fi
+        if [ "${{ secrets.TokenName5}}" ] ; then
+          set ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
+        fi
+        cd ../acmetest
+        bash.exe -c ./letest.sh
+
+  Solaris:
+    runs-on: macos-latest
+    needs: FreeBSD
+    env:
+      TEST_DNS : ${{ secrets.TEST_DNS }}
+      TestingDomain: ${{ secrets.TestingDomain }}
+      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
+      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
+      CASE: le_test_dnsapi
+      TEST_LOCAL: 1
+      DEBUG: 1
+    steps:
+    - uses: actions/checkout@v2
+    - name: Clone acmetest
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
+    - uses: vmactions/solaris-vm@v0.0.1
+      with:
+        envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
+        prepare: pkgutil -y -i socat curl
+        run: |
+          if [ "${{ secrets.TokenName1}}" ] ; then
+            export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
+          fi
+          if [ "${{ secrets.TokenName2}}" ] ; then
+            export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
+          fi
+          if [ "${{ secrets.TokenName3}}" ] ; then
+            export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
+          fi
+          if [ "${{ secrets.TokenName4}}" ] ; then
+            export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
+          fi
+          if [ "${{ secrets.TokenName5}}" ] ; then
+            export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
+          fi
+          cd ../acmetest
+          ./letest.sh
+

.github/workflows/DragonFlyBSD.yml

@@ -1,71 +0,0 @@
-name: DragonFlyBSD
-on:
-  push:
-    branches:
-      - '*'
-    paths:
-      - '*.sh'
-      - '.github/workflows/DragonFlyBSD.yml'
-
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '*.sh'
-      - '.github/workflows/DragonFlyBSD.yml'
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
-
-jobs:
-  DragonFlyBSD:
-    strategy:
-      matrix:
-        include:
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-         #- TEST_ACME_Server: "ZeroSSL.com"
-         #  CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
-         #  CA: "ZeroSSL RSA Domain Secure Site CA"
-         #  CA_EMAIL: "githubtest@acme.sh"
-         #  TEST_PREFERRED_CHAIN: ""
-    runs-on: ubuntu-latest
-    env:
-      TEST_LOCAL: 1
-      TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}
-      CA: ${{ matrix.CA }}
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}
-      TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
-      ACME_USE_WGET: ${{ matrix.ACME_USE_WGET }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: vmactions/cf-tunnel@v0
-      id: tunnel
-      with:
-        protocol: http
-        port: 8080
-    - name: Set envs
-      run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/dragonflybsd-vm@v1
-      with:
-        envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET'
-        nat: |
-          "8080": "80"
-        prepare: |
-          pkg install -y curl socat libnghttp2
-        usesh: true
-        copyback: false
-        run: |
-          cd ../acmetest \
-          && ./letest.sh
-
-

.github/workflows/FreeBSD.yml

@@ -1,76 +0,0 @@
-name: FreeBSD
-on:
-  push:
-    branches:
-      - '*'
-    paths:
-      - '*.sh'
-      - '.github/workflows/FreeBSD.yml'
-
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '*.sh'
-      - '.github/workflows/FreeBSD.yml'
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
-
-jobs:
-  FreeBSD:
-    strategy:
-      matrix:
-        include:
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-           ACME_USE_WGET: 1
-         #- TEST_ACME_Server: "ZeroSSL.com"
-         #  CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
-         #  CA: "ZeroSSL RSA Domain Secure Site CA"
-         #  CA_EMAIL: "githubtest@acme.sh"
-         #  TEST_PREFERRED_CHAIN: ""
-    runs-on: ubuntu-latest
-    env:
-      TEST_LOCAL: 1
-      TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}
-      CA: ${{ matrix.CA }}
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}
-      TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
-      ACME_USE_WGET: ${{ matrix.ACME_USE_WGET }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: vmactions/cf-tunnel@v0
-      id: tunnel
-      with:
-        protocol: http
-        port: 8080
-    - name: Set envs
-      run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/freebsd-vm@v1
-      with:
-        envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET'
-        nat: |
-          "8080": "80"
-        prepare: pkg install -y socat curl wget
-        usesh: true
-        copyback: false
-        run: |
-          cd ../acmetest \
-          && ./letest.sh
-
-

.github/workflows/LetsEncrypt.yml

@@ -0,0 +1,146 @@
+name: LetsEncrypt
+on:
+  push:
+    branches:
+      - '*'
+    paths:
+      - '**.sh'
+      - '**.yml'
+  pull_request:
+    branches:
+      - dev
+    paths:
+      - '**.sh'
+      - '**.yml'
+
+
+jobs:
+  CheckToken:
+    runs-on: ubuntu-latest
+    outputs:
+      hasToken: ${{ steps.step_one.outputs.hasToken }}
+    env: 
+      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
+    steps:
+      - name: Set the value
+        id: step_one
+        run: |
+          if [ "$NGROK_TOKEN" ] ; then
+            echo "::set-output name=hasToken::true"
+          else
+            echo "::set-output name=hasToken::false"
+          fi
+      - name: Check the value
+        run: echo ${{ steps.step_one.outputs.hasToken }}
+
+  Ubuntu:
+    runs-on: ubuntu-latest
+    needs: CheckToken
+    if: "contains(needs.CheckToken.outputs.hasToken, 'true')"
+    env:
+      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
+      TEST_LOCAL: 1
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install tools
+      run: sudo apt-get install -y socat
+    - name: Clone acmetest
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
+    - name: Run acmetest
+      run: cd ../acmetest && sudo --preserve-env ./letest.sh
+
+  MacOS:
+    runs-on: macos-latest
+    needs: Ubuntu
+    env:
+      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
+      TEST_LOCAL: 1
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install tools
+      run:  brew update && brew install socat;
+    - name: Clone acmetest
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
+    - name: Run acmetest
+      run: cd ../acmetest && sudo --preserve-env ./letest.sh
+
+  Windows:
+    runs-on: windows-latest
+    needs: MacOS
+    env:
+      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
+      TEST_LOCAL: 1
+      #The 80 port is used by Windows server, we have to use a custom port, ngrok will also use this port.
+      Le_HTTPPort: 8888
+    steps:
+    - name: Set git to use LF
+      run: |
+          git config --global core.autocrlf false
+    - uses: actions/checkout@v2
+    - name: Install cygwin base packages with chocolatey
+      run: |
+          choco config get cacheLocation
+          choco install --no-progress cygwin
+      shell: cmd
+    - name: Install cygwin additional packages
+      run: |
+          C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -s http://mirrors.kernel.org/sourceware/cygwin/ -P socat,curl,cron,unzip,git
+      shell: cmd
+    - name: Set ENV
+      shell: cmd
+      run: |
+          echo PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin >> %GITHUB_ENV%
+    - name: Check ENV
+      shell: cmd
+      run: |
+          echo "PATH=%PATH%"
+    - name: Clone acmetest
+      shell: cmd
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
+    - name: Run acmetest
+      shell: cmd
+      run: cd ../acmetest && bash.exe -c ./letest.sh
+
+  FreeBSD:
+    runs-on: macos-latest
+    needs: Windows
+    env:
+      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
+      TEST_LOCAL: 1
+    steps:
+    - uses: actions/checkout@v2
+    - name: Clone acmetest
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
+    - uses: vmactions/freebsd@main
+      with:
+        envs: 'NGROK_TOKEN TEST_LOCAL'
+        prepare: pkg install -y socat
+        run: |
+          cd ../acmetest && ./letest.sh
+
+  Solaris:
+    runs-on: macos-latest
+    needs: FreeBSD
+    env:
+      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
+      TEST_LOCAL: 1
+    steps:
+    - uses: actions/checkout@v2
+    - uses: vmactions/ngrok-tunnel@v0.0.1
+      id: ngrok
+      with:
+        protocol: http
+        port: 8080
+    - name: Set envs
+      run: echo "TestingDomain=${{steps.ngrok.outputs.server}}" >> $GITHUB_ENV
+    - name: Clone acmetest
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
+    - uses: vmactions/solaris-vm@v0.0.1
+      with:
+        envs: 'TEST_LOCAL TestingDomain'
+        nat: |
+          "8080": "80"
+        prepare: pkgutil -y -i socat curl
+        run: |
+          cd ../acmetest && ./letest.sh
+

.github/workflows/Linux.yml

@@ -1,48 +0,0 @@
-name: Linux
-on:
-  push:
-    branches:
-      - '*'
-    paths:
-      - '*.sh'
-      - '.github/workflows/Linux.yml'
-
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '*.sh'
-      - '.github/workflows/Linux.yml'
-
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
-
-
-jobs:
-  Linux:
-    strategy:
-      matrix:
-        os: ["ubuntu:latest", "debian:latest", "almalinux:latest", "fedora:latest", "opensuse/leap:latest", "alpine:latest", "oraclelinux:8", "kalilinux/kali", "archlinux:latest", "mageia", "gentoo/stage3"]
-    runs-on: ubuntu-latest
-    env:
-      TEST_LOCAL: 1
-      TEST_PREFERRED_CHAIN: (STAGING)
-      TEST_ACME_Server: "LetsEncrypt.org_test"
-    steps:
-    - uses: actions/checkout@v4
-    - name: Clone acmetest
-      run: |
-          cd .. \
-          && git clone --depth=1 https://github.com/acmesh-official/acmetest.git \
-          && cp -r acme.sh acmetest/
-    - name: Run acmetest
-      run: |
-          cd ../acmetest \
-          && ./rundocker.sh  testplat ${{ matrix.os }}
-
-
-

.github/workflows/MacOS.yml

@@ -1,60 +0,0 @@
-name: MacOS
-on:
-  push:
-    branches:
-      - '*'
-    paths:
-      - '*.sh'
-      - '.github/workflows/MacOS.yml'
-
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '*.sh'
-      - '.github/workflows/MacOS.yml'
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
-
-jobs:
-  MacOS:
-    strategy:
-      matrix:
-        include:
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-         #- TEST_ACME_Server: "ZeroSSL.com"
-         #  CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
-         #  CA: "ZeroSSL RSA Domain Secure Site CA"
-         #  CA_EMAIL: "githubtest@acme.sh"
-         #  TEST_PREFERRED_CHAIN: ""
-    runs-on: macos-latest
-    env:
-      TEST_LOCAL: 1
-      TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}
-      CA: ${{ matrix.CA }}
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}
-      TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install tools
-      run:  brew install socat
-    - name: Clone acmetest
-      run: |
-          cd .. \
-          && git clone --depth=1 https://github.com/acmesh-official/acmetest.git \
-          && cp -r acme.sh acmetest/
-    - name: Run acmetest
-      run: |
-          cd ../acmetest \
-          && sudo --preserve-env ./letest.sh
-
-

.github/workflows/NetBSD.yml

@@ -1,71 +0,0 @@
-name: NetBSD
-on:
-  push:
-    branches:
-      - '*'
-    paths:
-      - '*.sh'
-      - '.github/workflows/NetBSD.yml'
-
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '*.sh'
-      - '.github/workflows/NetBSD.yml'
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
-
-jobs:
-  NetBSD:
-    strategy:
-      matrix:
-        include:
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-         #- TEST_ACME_Server: "ZeroSSL.com"
-         #  CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
-         #  CA: "ZeroSSL RSA Domain Secure Site CA"
-         #  CA_EMAIL: "githubtest@acme.sh"
-         #  TEST_PREFERRED_CHAIN: ""
-    runs-on: ubuntu-latest
-    env:
-      TEST_LOCAL: 1
-      TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}
-      CA: ${{ matrix.CA }}
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}
-      TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
-      ACME_USE_WGET: ${{ matrix.ACME_USE_WGET }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: vmactions/cf-tunnel@v0
-      id: tunnel
-      with:
-        protocol: http
-        port: 8080
-    - name: Set envs
-      run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/netbsd-vm@v1
-      with:
-        envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET'
-        nat: |
-          "8080": "80"
-        prepare: |
-          /usr/sbin/pkg_add curl socat
-        usesh: true
-        copyback: false
-        run: |
-          cd ../acmetest \
-          && ./letest.sh
-
-

.github/workflows/Omnios.yml

@@ -1,75 +0,0 @@
-name: Omnios
-on:
-  push:
-    branches:
-      - '*'
-    paths:
-      - '*.sh'
-      - '.github/workflows/Omnios.yml'
-
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '*.sh'
-      - '.github/workflows/Omnios.yml'
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
-
-jobs:
-  Omnios:
-    strategy:
-      matrix:
-        include:
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-           ACME_USE_WGET: 1
-         #- TEST_ACME_Server: "ZeroSSL.com"
-         #  CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
-         #  CA: "ZeroSSL RSA Domain Secure Site CA"
-         #  CA_EMAIL: "githubtest@acme.sh"
-         #  TEST_PREFERRED_CHAIN: ""
-    runs-on: ubuntu-latest
-    env:
-      TEST_LOCAL: 1
-      TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}
-      CA: ${{ matrix.CA }}
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}
-      TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
-      ACME_USE_WGET: ${{ matrix.ACME_USE_WGET }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: vmactions/cf-tunnel@v0
-      id: tunnel
-      with:
-        protocol: http
-        port: 8080
-    - name: Set envs
-      run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/omnios-vm@v1
-      with:
-        envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET'
-        nat: |
-          "8080": "80"
-        prepare: pkg install socat wget
-        copyback: false
-        run: |
-          cd ../acmetest \
-          && ./letest.sh
-
-

.github/workflows/OpenBSD.yml

@@ -1,76 +0,0 @@
-name: OpenBSD
-on:
-  push:
-    branches:
-      - '*'
-    paths:
-      - '*.sh'
-      - '.github/workflows/OpenBSD.yml'
-
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '*.sh'
-      - '.github/workflows/OpenBSD.yml'
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
-
-jobs:
-  OpenBSD:
-    strategy:
-      matrix:
-        include:
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-           ACME_USE_WGET: 1
-         #- TEST_ACME_Server: "ZeroSSL.com"
-         #  CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
-         #  CA: "ZeroSSL RSA Domain Secure Site CA"
-         #  CA_EMAIL: "githubtest@acme.sh"
-         #  TEST_PREFERRED_CHAIN: ""
-    runs-on: ubuntu-latest
-    env:
-      TEST_LOCAL: 1
-      TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}
-      CA: ${{ matrix.CA }}
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}
-      TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
-      ACME_USE_WGET: ${{ matrix.ACME_USE_WGET }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: vmactions/cf-tunnel@v0
-      id: tunnel
-      with:
-        protocol: http
-        port: 8080
-    - name: Set envs
-      run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/openbsd-vm@v1
-      with:
-        envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET'
-        nat: |
-          "8080": "80"
-        prepare: pkg_add socat curl wget libnghttp2
-        usesh: true
-        copyback: false
-        run: |
-          cd ../acmetest \
-          && ./letest.sh
-
-

.github/workflows/PebbleStrict.yml

@@ -4,21 +4,14 @@ on:
     branches:
       - '*'
     paths:
-      - '*.sh'
-      - '.github/workflows/PebbleStrict.yml'
+      - '**.sh'
+      - '**.yml'
   pull_request:
     branches:
       - dev
     paths:
-      - '*.sh'
-      - '.github/workflows/PebbleStrict.yml'
-
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
+      - '**.sh'
+      - '**.yml'
 
 jobs:
   PebbleStrict:
@@ -26,47 +19,21 @@ jobs:
     env:
       TestingDomain: example.com
       TestingAltDomains: www.example.com
-      TEST_ACME_Server: https://localhost:14000/dir
+      ACME_DIRECTORY: https://localhost:14000/dir
       HTTPS_INSECURE: 1
       Le_HTTPPort: 5002
       TEST_LOCAL: 1
       TEST_CA: "Pebble Intermediate CA"
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Install tools
       run: sudo apt-get install -y socat
     - name: Run Pebble
-      run: cd .. && curl https://raw.githubusercontent.com/letsencrypt/pebble/master/docker-compose.yml >docker-compose.yml && docker compose up -d
+      run: cd .. && curl https://raw.githubusercontent.com/letsencrypt/pebble/master/docker-compose.yml >docker-compose.yml && docker-compose up -d
     - name: Set up Pebble
       run: curl --request POST --data '{"ip":"10.30.50.1"}' http://localhost:8055/set-default-ipv4
     - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - name: Run acmetest
-      run: cd ../acmetest && ./letest.sh
-
-  PebbleStrict_IPCert:
-    runs-on: ubuntu-latest
-    env:
-      TestingDomain: 1.23.45.67
-      TEST_ACME_Server: https://localhost:14000/dir
-      HTTPS_INSECURE: 1
-      Le_HTTPPort: 5002
-      Le_TLSPort: 5001
-      TEST_LOCAL: 1
-      TEST_CA: "Pebble Intermediate CA"
-      TEST_IPCERT: 1
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install tools
-      run: sudo apt-get install -y socat
-    - name: Run Pebble
-      run: |
-        docker run --rm -itd --name=pebble \
-        -e PEBBLE_VA_ALWAYS_VALID=1 \
-        -p 14000:14000 -p 15000:15000   letsencrypt/pebble:latest pebble -config /test/config/pebble-config.json -strict
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
     - name: Run acmetest
       run: cd ../acmetest && ./letest.sh

.github/workflows/Solaris.yml

@@ -1,75 +0,0 @@
-name: Solaris
-on:
-  push:
-    branches:
-      - '*'
-    paths:
-      - '*.sh'
-      - '.github/workflows/Solaris.yml'
-
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '*.sh'
-      - '.github/workflows/Solaris.yml'
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
-
-jobs:
-  Solaris:
-    strategy:
-      matrix:
-        include:
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-           ACME_USE_WGET: 1
-         #- TEST_ACME_Server: "ZeroSSL.com"
-         #  CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
-         #  CA: "ZeroSSL RSA Domain Secure Site CA"
-         #  CA_EMAIL: "githubtest@acme.sh"
-         #  TEST_PREFERRED_CHAIN: ""
-    runs-on: ubuntu-latest
-    env:
-      TEST_LOCAL: 1
-      TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}
-      CA: ${{ matrix.CA }}
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}
-      TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
-      ACME_USE_WGET: ${{ matrix.ACME_USE_WGET }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: vmactions/cf-tunnel@v0
-      id: tunnel
-      with:
-        protocol: http
-        port: 8080
-    - name: Set envs
-      run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV
-    - name: Clone acmetest
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/solaris-vm@v1
-      with:
-        envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET'
-        nat: |
-          "8080": "80"
-        prepare: pkgutil -y -i socat curl wget
-        copyback: false
-        run: |
-          cd ../acmetest \
-          && ./letest.sh
-
-

.github/workflows/Ubuntu.yml

@@ -1,103 +0,0 @@
-name: Ubuntu
-on:
-  push:
-    branches:
-      - '*'
-    paths:
-      - '*.sh'
-      - '.github/workflows/Ubuntu.yml'
-
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '*.sh'
-      - '.github/workflows/Ubuntu.yml'
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
-
-jobs:
-  Ubuntu:
-    strategy:
-      matrix:
-        include:
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-           ACME_USE_WGET: 1
-         - TEST_ACME_Server: "ZeroSSL.com"
-           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
-           CA: "ZeroSSL RSA Domain Secure Site CA"
-           CA_EMAIL: "githubtest@acme.sh"
-           TEST_PREFERRED_CHAIN: ""
-         - TEST_ACME_Server: "https://localhost:9000/acme/acme/directory"
-           CA_ECDSA: "Smallstep Intermediate CA"
-           CA: "Smallstep Intermediate CA"
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: ""
-           NO_REVOKE: 1
-         - TEST_ACME_Server: "https://localhost:9000/acme/acme/directory"
-           CA_ECDSA: "Smallstep Intermediate CA"
-           CA: "Smallstep Intermediate CA"
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: ""
-           NO_REVOKE: 1
-           TEST_IPCERT: 1
-           TestingDomain: "172.17.0.1"
-
-    runs-on: ubuntu-latest
-    env:
-      TEST_LOCAL: 1
-      TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}
-      CA: ${{ matrix.CA }}
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}
-      NO_ECC_384: ${{ matrix.NO_ECC_384 }}
-      TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
-      NO_REVOKE: ${{ matrix.NO_REVOKE }}
-      TEST_IPCERT: ${{ matrix.TEST_IPCERT }}
-      TestingDomain: ${{ matrix.TestingDomain }}
-      ACME_USE_WGET: ${{ matrix.ACME_USE_WGET }}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install tools
-      run: sudo apt-get install -y socat wget
-    - name: Start StepCA
-      if: ${{ matrix.TEST_ACME_Server=='https://localhost:9000/acme/acme/directory' }}
-      run: |
-           docker run --rm -d \
-            -p 9000:9000 \
-            -e "DOCKER_STEPCA_INIT_NAME=Smallstep" \
-            -e "DOCKER_STEPCA_INIT_DNS_NAMES=localhost,$(hostname -f)" \
-            -e "DOCKER_STEPCA_INIT_REMOTE_MANAGEMENT=true" \
-            -e "DOCKER_STEPCA_INIT_PASSWORD=test" \
-            --name stepca \
-            smallstep/step-ca:0.23.1
-
-            sleep 5
-            docker exec  stepca bash -c "echo test >test" \
-            && docker exec stepca step ca provisioner add acme --type ACME --admin-subject  step --admin-password-file=/home/step/test \
-            && docker exec  stepca kill -1 1 \
-            && docker exec  stepca cat /home/step/certs/root_ca.crt | sudo bash -c "cat - >>/etc/ssl/certs/ca-certificates.crt"
-    - name: Clone acmetest
-      run: |
-          cd .. \
-          && git clone --depth=1 https://github.com/acmesh-official/acmetest.git \
-          && cp -r acme.sh acmetest/
-    - name: Run acmetest
-      run: |
-          cd ../acmetest \
-          && sudo --preserve-env ./letest.sh
-
-

.github/workflows/Windows.yml

@@ -1,78 +0,0 @@
-name: Windows
-on:
-  push:
-    branches:
-      - '*'
-    paths:
-      - '*.sh'
-      - '.github/workflows/Windows.yml'
-
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '*.sh'
-      - '.github/workflows/Windows.yml'
-
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-
-jobs:
-  Windows:
-    strategy:
-      matrix:
-        include:
-         - TEST_ACME_Server: "LetsEncrypt.org_test"
-           CA_ECDSA: ""
-           CA: ""
-           CA_EMAIL: ""
-           TEST_PREFERRED_CHAIN: (STAGING)
-         #- TEST_ACME_Server: "ZeroSSL.com"
-         #  CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
-         #  CA: "ZeroSSL RSA Domain Secure Site CA"
-         #  CA_EMAIL: "githubtest@acme.sh"
-         #  TEST_PREFERRED_CHAIN: ""
-    runs-on: windows-latest
-    env:
-      TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}
-      CA: ${{ matrix.CA }}
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}
-      TEST_LOCAL: 1
-      #The 80 port is used by Windows server, we have to use a custom port, tunnel will also use this port.
-      Le_HTTPPort: 8888
-      TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
-    steps:
-    - name: Set git to use LF
-      run: |
-          git config --global core.autocrlf false
-    - uses: actions/checkout@v4
-    - name: Install cygwin base packages with chocolatey
-      run: |
-          choco config get cacheLocation
-          choco install --no-progress cygwin
-      shell: cmd
-    - name: Install cygwin additional packages
-      run: |
-          C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -s https://mirrors.kernel.org/sourceware/cygwin/ -P socat,curl,cron,unzip,git,xxd
-      shell: cmd
-    - name: Set ENV
-      shell: cmd
-      run: |
-          echo PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin;%PATH% >> %GITHUB_ENV%
-    - name: Check ENV
-      shell: cmd
-      run: |
-          echo "PATH=%PATH%"
-    - name: Clone acmetest
-      shell: cmd
-      run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - name: Run acmetest
-      shell: cmd
-      run: cd ../acmetest && bash.exe -c ./letest.sh
-
-
-

.github/workflows/dockerhub.yml

@@ -6,18 +6,7 @@ on:
       - '*'
     tags:
       - '*'
-    paths:
-      - '**.sh'
-      - "Dockerfile"
-      - '.github/workflows/dockerhub.yml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  DOCKER_IMAGE: neilpang/acme.sh
-
+    
 jobs:
   CheckToken:
     runs-on: ubuntu-latest
@@ -30,9 +19,9 @@ jobs:
         id: step_one
         run: |
           if [ "$DOCKER_PASSWORD" ] ; then
-            echo "hasToken=true" >>$GITHUB_OUTPUT
+            echo "::set-output name=hasToken::true"
           else
-            echo "hasToken=false" >>$GITHUB_OUTPUT
+            echo "::set-output name=hasToken::false"
           fi
       - name: Check the value
         run: echo ${{ steps.step_one.outputs.hasToken }}
@@ -43,21 +32,20 @@ jobs:
     if: "contains(needs.CheckToken.outputs.hasToken, 'true')"
     steps:
       - name: checkout code
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5.5.1
+        uses: actions/checkout@v2
+      - name: install buildx
+        id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
         with:
-          images: ${DOCKER_IMAGE}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+          buildx-version: latest
+          qemu-version: latest
       - name: login to docker hub
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
       - name: build and push the image
         run: |
+          DOCKER_IMAGE=neilpang/acme.sh
+
           if [[ $GITHUB_REF == refs/tags/* ]]; then
             DOCKER_IMAGE_TAG=${GITHUB_REF#refs/tags/}
           fi
@@ -71,14 +59,8 @@ jobs:
             fi
           fi
 
-          DOCKER_LABELS=()
-          while read -r label; do
-            DOCKER_LABELS+=(--label "${label}")
-          done <<<"${DOCKER_METADATA_OUTPUT_LABELS}"
-
           docker buildx build \
             --tag ${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG} \
-            "${DOCKER_LABELS[@]}" \
             --output "type=image,push=true" \
             --build-arg AUTO_UPGRADE=${AUTO_UPGRADE} \
             --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386,linux/ppc64le,linux/s390x .

.github/workflows/issue.yml

@@ -1,19 +0,0 @@
-name: "Update issues"
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  comment:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          script: |
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: "Please upgrade to the latest code and try again first. Maybe it's already fixed.              ```acme.sh --upgrade```              If it's still not working, please provide the log with `--debug 2`, otherwise, nobody can help you."
-              
-            })

.github/workflows/pr_dns.yml

@@ -1,30 +0,0 @@
-name: Check dns api
-
-on:
-  pull_request_target:
-    types:
-      - opened
-    paths:
-      - 'dnsapi/*.sh'
-
-
-jobs:
-  welcome:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          script: |
-            await github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `**Welcome**
-                First thing: don't send PR to the master branch, please send to the dev branch instead.
-                Please make sure you've read our [DNS API Dev Guide](../wiki/DNS-API-Dev-Guide) and [DNS-API-Test](../wiki/DNS-API-Test).
-                Then reply on this message, otherwise, your code will not be reviewed or merged.
-                We look forward to reviewing your Pull request shortly ✨
-                注意: 必须通过了 [DNS-API-Test](../wiki/DNS-API-Test) 才会被 review. 无论是修改, 还是新加的 dns api, 都必须确保通过这个测试.
-                `
-            })
-

.github/workflows/pr_notify.yml

@@ -1,30 +0,0 @@
-name: Check notify api
-
-on:
-  pull_request_target:
-    types:
-      - opened
-    branches:
-      - 'dev'
-    paths:
-      - 'notify/*.sh'
-
-
-jobs:
-  welcome:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          script: |
-            await github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `**Welcome**
-                Please make sure you've read our [Code-of-conduct](../wiki/Code-of-conduct) and  add the usage here: [notify](../wiki/notify).
-                Then reply on this message, otherwise, your code will not be reviewed or merged.
-                We look forward to reviewing your Pull request shortly ✨
-                `
-            })
-

.github/workflows/shellcheck.yml

@@ -5,33 +5,28 @@ on:
       - '*'
     paths:
       - '**.sh'
-      - '.github/workflows/shellcheck.yml'
+      - '**.yml'
   pull_request:
     branches:
       - dev
     paths:
       - '**.sh'
-      - '.github/workflows/shellcheck.yml'
-
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
+      - '**.yml'
 
 jobs:
   ShellCheck:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Install Shellcheck
       run: sudo apt-get install -y shellcheck
     - name: DoShellcheck
-      run: shellcheck -V  && shellcheck -e SC2181 -e SC2089 **/*.sh && echo "shellcheck OK"
+      run: shellcheck -V  && shellcheck -e SC2181 **/*.sh && echo "shellcheck OK"
 
   shfmt:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Install shfmt
       run: curl -sSL https://github.com/mvdan/sh/releases/download/v3.1.2/shfmt_v3.1.2_linux_amd64 -o ~/shfmt && chmod +x ~/shfmt
     - name: shfmt

Dockerfile

@@ -1,6 +1,7 @@
-FROM alpine:3.17
+FROM alpine:3.12
 
-RUN apk --no-cache add -f \
+RUN apk update -f \
+  && apk --no-cache add -f \
   openssl \
   openssh-client \
   coreutils \
@@ -11,9 +12,7 @@ RUN apk --no-cache add -f \
   tzdata \
   oath-toolkit-oathtool \
   tar \
-  libidn \
-  jq \
-  cronie
+  && rm -rf /var/cache/apk/*
 
 ENV LE_CONFIG_HOME /acme.sh
 
@@ -22,11 +21,11 @@ ARG AUTO_UPGRADE=1
 ENV AUTO_UPGRADE $AUTO_UPGRADE
 
 #Install
-COPY ./ /install_acme.sh/
+ADD ./ /install_acme.sh/
 RUN cd /install_acme.sh && ([ -f /install_acme.sh/acme.sh ] && /install_acme.sh/acme.sh --install || curl https://get.acme.sh | sh) && rm -rf /install_acme.sh/
 
 
-RUN ln -s /root/.acme.sh/acme.sh /usr/local/bin/acme.sh && crontab -l | grep acme.sh | sed 's#> /dev/null#> /proc/1/fd/1 2>/proc/1/fd/2#' | crontab -
+RUN ln -s  /root/.acme.sh/acme.sh  /usr/local/bin/acme.sh && crontab -l | grep acme.sh | sed 's#> /dev/null##' | crontab -
 
 RUN for verb in help \
   version \
@@ -42,7 +41,6 @@ RUN for verb in help \
   revoke \
   remove \
   list \
-  info \
   showcsr \
   install-cronjob \
   uninstall-cronjob \
@@ -58,17 +56,17 @@ RUN for verb in help \
   deactivate-account \
   set-notify \
   set-default-ca \
-  set-default-chain \
   ; do \
     printf -- "%b" "#!/usr/bin/env sh\n/root/.acme.sh/acme.sh --${verb} --config-home /acme.sh \"\$@\"" >/usr/local/bin/--${verb} && chmod +x /usr/local/bin/--${verb} \
   ; done
 
 RUN printf "%b" '#!'"/usr/bin/env sh\n \
 if [ \"\$1\" = \"daemon\" ];  then \n \
- exec crond -n -s -m off \n \
+ trap \"echo stop && killall crond && exit 0\" SIGTERM SIGINT \n \
+ crond && while true; do sleep 1; done;\n \
 else \n \
  exec -- \"\$@\"\n \
-fi\n" >/entry.sh && chmod +x /entry.sh
+fi" >/entry.sh && chmod +x /entry.sh
 
 VOLUME /acme.sh
 

README.md

@@ -1,15 +1,6 @@
 # An ACME Shell script: acme.sh 
 
-[![FreeBSD](https://github.com/acmesh-official/acme.sh/actions/workflows/FreeBSD.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/FreeBSD.yml)
-[![OpenBSD](https://github.com/acmesh-official/acme.sh/actions/workflows/OpenBSD.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/OpenBSD.yml)
-[![NetBSD](https://github.com/acmesh-official/acme.sh/actions/workflows/NetBSD.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/NetBSD.yml)
-[![MacOS](https://github.com/acmesh-official/acme.sh/actions/workflows/MacOS.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/MacOS.yml)
-[![Ubuntu](https://github.com/acmesh-official/acme.sh/actions/workflows/Ubuntu.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Ubuntu.yml)
-[![Windows](https://github.com/acmesh-official/acme.sh/actions/workflows/Windows.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Windows.yml)
-[![Solaris](https://github.com/acmesh-official/acme.sh/actions/workflows/Solaris.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Solaris.yml)
-[![DragonFlyBSD](https://github.com/acmesh-official/acme.sh/actions/workflows/DragonFlyBSD.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/DragonFlyBSD.yml)
-[![Omnios](https://github.com/acmesh-official/acme.sh/actions/workflows/Omnios.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Omnios.yml)
-
+![LetsEncrypt](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)
 ![Shellcheck](https://github.com/acmesh-official/acme.sh/workflows/Shellcheck/badge.svg)
 ![PebbleStrict](https://github.com/acmesh-official/acme.sh/workflows/PebbleStrict/badge.svg)
 ![DockerHub](https://github.com/acmesh-official/acme.sh/workflows/Build%20DockerHub/badge.svg)
@@ -24,18 +15,18 @@
 
 - An ACME protocol client written purely in Shell (Unix shell) language.
 - Full ACME protocol implementation.
-- Support ECDSA certs
-- Support SAN and wildcard certs
+- Support ACME v1 and ACME v2
+- Support ACME v2 wildcard certs
 - Simple, powerful and very easy to use. You only need 3 minutes to learn it.
 - Bash, dash and sh compatible.
-- Purely written in Shell with no dependencies on python.
+- Purely written in Shell with no dependencies on python or the official Let's Encrypt client.
 - Just one script to issue, renew and install your certificates automatically.
 - DOES NOT require `root/sudoer` access.
-- Docker ready
-- IPv6 ready
+- Docker friendly
+- IPv6 support
 - Cron job notifications for renewal or error etc.
 
-It's probably the `easiest & smartest` shell script to automatically issue & renew the free certificates.
+It's probably the `easiest & smartest` shell script to automatically issue & renew the free certificates from Let's Encrypt.
 
 Wiki: https://github.com/acmesh-official/acme.sh/wiki
 
@@ -51,12 +42,14 @@ Twitter: [@neilpangxa](https://twitter.com/neilpangxa)
 - [ruby-china.org](https://ruby-china.org/topics/31983)
 - [Proxmox](https://pve.proxmox.com/wiki/Certificate_Management)
 - [pfsense](https://github.com/pfsense/FreeBSD-ports/pull/89)
+- [webfaction](https://community.webfaction.com/questions/19988/using-letsencrypt)
 - [Loadbalancer.org](https://www.loadbalancer.org/blog/loadbalancer-org-with-lets-encrypt-quick-and-dirty)
 - [discourse.org](https://meta.discourse.org/t/setting-up-lets-encrypt/40709)
 - [Centminmod](https://centminmod.com/letsencrypt-acmetool-https.html)
 - [splynx](https://forum.splynx.com/t/free-ssl-cert-for-splynx-lets-encrypt/297)
+- [archlinux](https://www.archlinux.org/packages/community/any/acme.sh)
 - [opnsense.org](https://github.com/opnsense/plugins/tree/master/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient)
-- [CentOS Web Panel](https://control-webpanel.com)
+- [CentOS Web Panel](http://centos-webpanel.com/)
 - [lnmp.org](https://lnmp.org/)
 - [more...](https://github.com/acmesh-official/acme.sh/wiki/Blogs-and-tutorials)
 
@@ -64,45 +57,38 @@ Twitter: [@neilpangxa](https://twitter.com/neilpangxa)
 
 | NO | Status| Platform|
 |----|-------|---------|
-|1|[![MacOS](https://github.com/acmesh-official/acme.sh/actions/workflows/MacOS.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/MacOS.yml)|Mac OSX
-|2|[![Windows](https://github.com/acmesh-official/acme.sh/actions/workflows/Windows.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Windows.yml)|Windows (cygwin with curl, openssl and crontab included)
-|3|[![FreeBSD](https://github.com/acmesh-official/acme.sh/actions/workflows/FreeBSD.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/FreeBSD.yml)|FreeBSD
-|4|[![Solaris](https://github.com/acmesh-official/acme.sh/actions/workflows/Solaris.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Solaris.yml)|Solaris
-|5|[![Ubuntu](https://github.com/acmesh-official/acme.sh/actions/workflows/Ubuntu.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Ubuntu.yml)| Ubuntu
-|6|NA|pfsense
-|7|[![OpenBSD](https://github.com/acmesh-official/acme.sh/actions/workflows/OpenBSD.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/OpenBSD.yml)|OpenBSD
-|8|[![NetBSD](https://github.com/acmesh-official/acme.sh/actions/workflows/NetBSD.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/NetBSD.yml)|NetBSD
-|9|[![DragonFlyBSD](https://github.com/acmesh-official/acme.sh/actions/workflows/DragonFlyBSD.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/DragonFlyBSD.yml)|DragonFlyBSD
-|10|[![Omnios](https://github.com/acmesh-official/acme.sh/actions/workflows/Omnios.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Omnios.yml)|Omnios
-|11|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)| Debian
-|12|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|CentOS
-|13|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|openSUSE
-|14|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Alpine Linux (with curl)
-|15|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Archlinux
-|16|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|fedora
-|17|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Kali Linux
-|18|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Oracle Linux
-|19|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Mageia
-|10|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Gentoo Linux
-|11|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|ClearLinux
-|22|-----| Cloud Linux  https://github.com/acmesh-official/acme.sh/issues/111
-|23|-----| OpenWRT: Tested and working. See [wiki page](https://github.com/acmesh-official/acme.sh/wiki/How-to-run-on-OpenWRT)
-|24|[![](https://acmesh-official.github.io/acmetest/status/proxmox.svg)](https://github.com/acmesh-official/letest#here-are-the-latest-status)| Proxmox: See Proxmox VE Wiki. Version [4.x, 5.0, 5.1](https://pve.proxmox.com/wiki/HTTPS_Certificate_Configuration_(Version_4.x,_5.0_and_5.1)#Let.27s_Encrypt_using_acme.sh), version [5.2 and up](https://pve.proxmox.com/wiki/Certificate_Management)
+|1|[![MacOS](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Mac OSX
+|2|[![Windows](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Windows (cygwin with curl, openssl and crontab included)
+|3|[![FreeBSD](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|FreeBSD
+|4|[![Solaris](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Solaris
+|5|[![Ubuntu](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)| Ubuntu
+|6|[![](https://acmesh-official.github.io/acmetest/status/pfsense.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|pfsense
+|7|[![](https://acmesh-official.github.io/acmetest/status/openbsd.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|OpenBSD
+|8|[![](https://acmesh-official.github.io/acmetest/status/debian-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)| Debian
+|9|[![](https://acmesh-official.github.io/acmetest/status/centos-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|CentOS
+|10|[![](https://acmesh-official.github.io/acmetest/status/opensuse-leap-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|openSUSE
+|11|[![](https://acmesh-official.github.io/acmetest/status/alpine-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Alpine Linux (with curl)
+|12|[![](https://acmesh-official.github.io/acmetest/status/archlinux-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Archlinux
+|13|[![](https://acmesh-official.github.io/acmetest/status/fedora-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|fedora
+|14|[![](https://acmesh-official.github.io/acmetest/status/kalilinux-kali.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Kali Linux
+|15|[![](https://acmesh-official.github.io/acmetest/status/oraclelinux-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Oracle Linux
+|16|[![](https://acmesh-official.github.io/acmetest/status/proxmox.svg)](https://github.com/acmesh-official/letest#here-are-the-latest-status)| Proxmox: See Proxmox VE Wiki. Version [4.x, 5.0, 5.1](https://pve.proxmox.com/wiki/HTTPS_Certificate_Configuration_(Version_4.x,_5.0_and_5.1)#Let.27s_Encrypt_using_acme.sh), version [5.2 and up](https://pve.proxmox.com/wiki/Certificate_Management)
+|17|-----| Cloud Linux  https://github.com/acmesh-official/acme.sh/issues/111
+|18|[![](https://acmesh-official.github.io/acmetest/status/mageia.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Mageia
+|19|-----| OpenWRT: Tested and working. See [wiki page](https://github.com/acmesh-official/acme.sh/wiki/How-to-run-on-OpenWRT)
+|20|[![](https://acmesh-official.github.io/acmetest/status/gentoo-stage3-amd64.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Gentoo Linux
+|21|[![](https://acmesh-official.github.io/acmetest/status/clearlinux-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|ClearLinux
 
-
-Check our [testing project](https://github.com/acmesh-official/acmetest):
+For all build statuses, check our [weekly build project](https://github.com/acmesh-official/acmetest):
 
 https://github.com/acmesh-official/acmetest
 
 # Supported CA
 
-- [ZeroSSL.com CA](https://github.com/acmesh-official/acme.sh/wiki/ZeroSSL.com-CA)(default)
-- Letsencrypt.org CA
+- Letsencrypt.org CA(default)
+- [ZeroSSL.com CA](https://github.com/acmesh-official/acme.sh/wiki/ZeroSSL.com-CA)
 - [BuyPass.com CA](https://github.com/acmesh-official/acme.sh/wiki/BuyPass.com-CA)
-- [SSL.com CA](https://github.com/acmesh-official/acme.sh/wiki/SSL.com-CA)
-- [Google.com Public CA](https://github.com/acmesh-official/acme.sh/wiki/Google-Public-CA)
 - [Pebble strict Mode](https://github.com/letsencrypt/pebble)
-- Any other [RFC8555](https://tools.ietf.org/html/rfc8555)-compliant CA
 
 # Supported modes
 
@@ -123,13 +109,13 @@ https://github.com/acmesh-official/acmetest
 Check this project: https://github.com/acmesh-official/get.acme.sh
 
 ```bash
-curl https://get.acme.sh | sh -s email=my@example.com
+curl https://get.acme.sh | sh
 ```
 
 Or:
 
 ```bash
-wget -O -  https://get.acme.sh | sh -s email=my@example.com
+wget -O -  https://get.acme.sh | sh
 ```
 
 
@@ -140,7 +126,7 @@ Clone this project and launch installation:
 ```bash
 git clone https://github.com/acmesh-official/acme.sh.git
 cd ./acme.sh
-./acme.sh --install -m my@example.com
+./acme.sh --install
 ```
 
 You `don't have to be root` then, although `it is recommended`.
@@ -360,6 +346,10 @@ Ok, it's done.
 
 # 10. Issue ECC certificates
 
+`Let's Encrypt` can now issue **ECDSA** certificates.
+
+And we support them too!
+
 Just set the `keylength` parameter with a prefix `ec-`.
 
 For example:
@@ -380,12 +370,10 @@ Please look at the `keylength` parameter above.
 
 Valid values are:
 
-1. **ec-256 (prime256v1, "ECDSA P-256", which is the default key type)**
+1. **ec-256 (prime256v1, "ECDSA P-256")**
 2. **ec-384 (secp384r1,  "ECDSA P-384")**
 3. **ec-521 (secp521r1,  "ECDSA P-521", which is not supported by Let's Encrypt yet.)**
-4. **2048   (RSA2048)**
-5. **3072   (RSA3072)**
-6. **4096   (RSA4096)**
+
 
 
 # 11. Issue Wildcard certificates
@@ -480,7 +468,7 @@ TODO:
 
 ### Code Contributors
 
-This project exists thanks to all the people who contribute.
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
 <a href="https://github.com/acmesh-official/acme.sh/graphs/contributors"><img src="https://opencollective.com/acmesh/contributors.svg?width=890&button=false" /></a>
 
 ### Financial Contributors
@@ -506,8 +494,6 @@ Support this project with your organization. Your logo will show up here with a
 <a href="https://opencollective.com/acmesh/organization/8/website"><img src="https://opencollective.com/acmesh/organization/8/avatar.svg"></a>
 <a href="https://opencollective.com/acmesh/organization/9/website"><img src="https://opencollective.com/acmesh/organization/9/avatar.svg"></a>
 
-
-
 # 19. License & Others
 
 License is GPLv3

deploy/ali_cdn.sh

@@ -1,88 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034,SC2154
-
-# Script to create certificate to Alibaba Cloud CDN
-#
-# Docs: https://github.com/acmesh-official/acme.sh/wiki/deployhooks#33-deploy-your-certificate-to-cdn-or-dcdn-of-alibaba-cloud-aliyun
-#
-# This deployment required following variables
-# export Ali_Key="ALIACCESSKEY"
-# export Ali_Secret="ALISECRETKEY"
-# The credentials are shared with all the Alibaba Cloud deploy hooks and dnsapi
-#
-# To specify the CDN domain that is different from the certificate CN, usually used for multi-domain or wildcard certificates
-# export DEPLOY_ALI_CDN_DOMAIN="cdn.example.com"
-# If you have multiple CDN domains using the same certificate, just
-# export DEPLOY_ALI_CDN_DOMAIN="cdn1.example.com cdn2.example.com"
-#
-# For DCDN, see ali_dcdn deploy hook
-
-Ali_CDN_API="https://cdn.aliyuncs.com/"
-
-ali_cdn_deploy() {
-  _cdomain="$1"
-  _ckey="$2"
-  _ccert="$3"
-  _cca="$4"
-  _cfullchain="$5"
-
-  _debug _cdomain "$_cdomain"
-  _debug _ckey "$_ckey"
-  _debug _ccert "$_ccert"
-  _debug _cca "$_cca"
-  _debug _cfullchain "$_cfullchain"
-
-  # Load dnsapi/dns_ali.sh to reduce the duplicated codes
-  # https://github.com/acmesh-official/acme.sh/pull/5205#issuecomment-2357867276
-  dnsapi_ali="$(_findHook "$_cdomain" "$_SUB_FOLDER_DNSAPI" dns_ali)"
-  # shellcheck source=/dev/null
-  if ! . "$dnsapi_ali"; then
-    _err "Error loading file $dnsapi_ali. Please check your API file and try again."
-    return 1
-  fi
-
-  _prepare_ali_credentials || return 1
-
-  _getdeployconf DEPLOY_ALI_CDN_DOMAIN
-  if [ "$DEPLOY_ALI_CDN_DOMAIN" ]; then
-    _savedeployconf DEPLOY_ALI_CDN_DOMAIN "$DEPLOY_ALI_CDN_DOMAIN"
-  else
-    DEPLOY_ALI_CDN_DOMAIN="$_cdomain"
-  fi
-
-  # read cert and key files and urlencode both
-  _cert=$(_url_encode upper-hex <"$_cfullchain")
-  _key=$(_url_encode upper-hex <"$_ckey")
-
-  _debug2 _cert "$_cert"
-  _debug2 _key "$_key"
-
-  ## update domain ssl config
-  for domain in $DEPLOY_ALI_CDN_DOMAIN; do
-    _set_cdn_domain_ssl_certificate_query "$domain" "$_cert" "$_key"
-    if _ali_rest "Set CDN domain SSL certificate for $domain" "" POST; then
-      _info "Domain $domain certificate has been deployed successfully"
-    fi
-  done
-
-  return 0
-}
-
-# domain pub pri
-_set_cdn_domain_ssl_certificate_query() {
-  endpoint=$Ali_CDN_API
-  query=''
-  query=$query'AccessKeyId='$Ali_Key
-  query=$query'&Action=SetCdnDomainSSLCertificate'
-  query=$query'&CertType=upload'
-  query=$query'&DomainName='$1
-  query=$query'&Format=json'
-  query=$query'&SSLPri='$3
-  query=$query'&SSLProtocol=on'
-  query=$query'&SSLPub='$2
-  query=$query'&SignatureMethod=HMAC-SHA1'
-  query=$query"&SignatureNonce=$(_ali_nonce)"
-  query=$query'&SignatureVersion=1.0'
-  query=$query'&Timestamp='$(_timestamp)
-  query=$query'&Version=2018-05-10'
-}

deploy/ali_dcdn.sh

@@ -1,88 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034,SC2154
-
-# Script to create certificate to Alibaba Cloud DCDN
-#
-# Docs: https://github.com/acmesh-official/acme.sh/wiki/deployhooks#33-deploy-your-certificate-to-cdn-or-dcdn-of-alibaba-cloud-aliyun
-#
-# This deployment required following variables
-# export Ali_Key="ALIACCESSKEY"
-# export Ali_Secret="ALISECRETKEY"
-# The credentials are shared with all the Alibaba Cloud deploy hooks and dnsapi
-#
-# To specify the DCDN domain that is different from the certificate CN, usually used for multi-domain or wildcard certificates
-# export DEPLOY_ALI_DCDN_DOMAIN="dcdn.example.com"
-# If you have multiple CDN domains using the same certificate, just
-# export DEPLOY_ALI_DCDN_DOMAIN="dcdn1.example.com dcdn2.example.com"
-#
-# For regular CDN, see ali_cdn deploy hook
-
-Ali_DCDN_API="https://dcdn.aliyuncs.com/"
-
-ali_dcdn_deploy() {
-  _cdomain="$1"
-  _ckey="$2"
-  _ccert="$3"
-  _cca="$4"
-  _cfullchain="$5"
-
-  _debug _cdomain "$_cdomain"
-  _debug _ckey "$_ckey"
-  _debug _ccert "$_ccert"
-  _debug _cca "$_cca"
-  _debug _cfullchain "$_cfullchain"
-
-  # Load dnsapi/dns_ali.sh to reduce the duplicated codes
-  # https://github.com/acmesh-official/acme.sh/pull/5205#issuecomment-2357867276
-  dnsapi_ali="$(_findHook "$_cdomain" "$_SUB_FOLDER_DNSAPI" dns_ali)"
-  # shellcheck source=/dev/null
-  if ! . "$dnsapi_ali"; then
-    _err "Error loading file $dnsapi_ali. Please check your API file and try again."
-    return 1
-  fi
-
-  _prepare_ali_credentials || return 1
-
-  _getdeployconf DEPLOY_ALI_DCDN_DOMAIN
-  if [ "$DEPLOY_ALI_DCDN_DOMAIN" ]; then
-    _savedeployconf DEPLOY_ALI_DCDN_DOMAIN "$DEPLOY_ALI_DCDN_DOMAIN"
-  else
-    DEPLOY_ALI_DCDN_DOMAIN="$_cdomain"
-  fi
-
-  # read cert and key files and urlencode both
-  _cert=$(_url_encode upper-hex <"$_cfullchain")
-  _key=$(_url_encode upper-hex <"$_ckey")
-
-  _debug2 _cert "$_cert"
-  _debug2 _key "$_key"
-
-  ## update domain ssl config
-  for domain in $DEPLOY_ALI_DCDN_DOMAIN; do
-    _set_dcdn_domain_ssl_certificate_query "$domain" "$_cert" "$_key"
-    if _ali_rest "Set DCDN domain SSL certificate for $domain" "" POST; then
-      _info "Domain $domain certificate has been deployed successfully"
-    fi
-  done
-
-  return 0
-}
-
-# domain pub pri
-_set_dcdn_domain_ssl_certificate_query() {
-  endpoint=$Ali_DCDN_API
-  query=''
-  query=$query'AccessKeyId='$Ali_Key
-  query=$query'&Action=SetDcdnDomainSSLCertificate'
-  query=$query'&CertType=upload'
-  query=$query'&DomainName='$1
-  query=$query'&Format=json'
-  query=$query'&SSLPri='$3
-  query=$query'&SSLProtocol=on'
-  query=$query'&SSLPub='$2
-  query=$query'&SignatureMethod=HMAC-SHA1'
-  query=$query"&SignatureNonce=$(_ali_nonce)"
-  query=$query'&SignatureVersion=1.0'
-  query=$query'&Timestamp='$(_timestamp)
-  query=$query'&Version=2018-01-15'
-}

deploy/cleverreach.sh

@@ -17,8 +17,6 @@ cleverreach_deploy() {
   _cca="$4"
   _cfullchain="$5"
 
-  _rest_endpoint="https://rest.cleverreach.com"
-
   _debug _cdomain "$_cdomain"
   _debug _ckey "$_ckey"
   _debug _ccert "$_ccert"
@@ -27,7 +25,6 @@ cleverreach_deploy() {
 
   _getdeployconf DEPLOY_CLEVERREACH_CLIENT_ID
   _getdeployconf DEPLOY_CLEVERREACH_CLIENT_SECRET
-  _getdeployconf DEPLOY_CLEVERREACH_SUBCLIENT_ID
 
   if [ -z "${DEPLOY_CLEVERREACH_CLIENT_ID}" ]; then
     _err "CleverReach Client ID is not found, please define DEPLOY_CLEVERREACH_CLIENT_ID."
@@ -40,12 +37,11 @@ cleverreach_deploy() {
 
   _savedeployconf DEPLOY_CLEVERREACH_CLIENT_ID "${DEPLOY_CLEVERREACH_CLIENT_ID}"
   _savedeployconf DEPLOY_CLEVERREACH_CLIENT_SECRET "${DEPLOY_CLEVERREACH_CLIENT_SECRET}"
-  _savedeployconf DEPLOY_CLEVERREACH_SUBCLIENT_ID "${DEPLOY_CLEVERREACH_SUBCLIENT_ID}"
 
   _info "Obtaining a CleverReach access token"
 
   _data="{\"grant_type\": \"client_credentials\", \"client_id\": \"${DEPLOY_CLEVERREACH_CLIENT_ID}\", \"client_secret\": \"${DEPLOY_CLEVERREACH_CLIENT_SECRET}\"}"
-  _auth_result="$(_post "$_data" "$_rest_endpoint/oauth/token.php" "" "POST" "application/json")"
+  _auth_result="$(_post "$_data" "https://rest.cleverreach.com/oauth/token.php" "" "POST" "application/json")"
 
   _debug _data "$_data"
   _debug _auth_result "$_auth_result"
@@ -54,32 +50,14 @@ cleverreach_deploy() {
   _debug _regex "$_regex"
   _access_token=$(echo "$_auth_result" | _json_decode | sed -n "s/$_regex/\1/p")
 
-  _debug _subclient "${DEPLOY_CLEVERREACH_SUBCLIENT_ID}"
-
-  if [ -n "${DEPLOY_CLEVERREACH_SUBCLIENT_ID}" ]; then
-    _info "Obtaining token for sub-client ${DEPLOY_CLEVERREACH_SUBCLIENT_ID}"
-    export _H1="Authorization: Bearer ${_access_token}"
-    _subclient_token_result="$(_get "$_rest_endpoint/v3/clients/$DEPLOY_CLEVERREACH_SUBCLIENT_ID/token")"
-    _access_token=$(echo "$_subclient_token_result" | sed -n "s/\"//p")
-
-    _debug _subclient_token_result "$_access_token"
-
-    _info "Destroying parent token at CleverReach, as it not needed anymore"
-    _destroy_result="$(_post "" "$_rest_endpoint/v3/oauth/token.json" "" "DELETE" "application/json")"
-    _debug _destroy_result "$_destroy_result"
-  fi
-
   _info "Uploading certificate and key to CleverReach"
 
   _certData="{\"cert\":\"$(_json_encode <"$_cfullchain")\", \"key\":\"$(_json_encode <"$_ckey")\"}"
   export _H1="Authorization: Bearer ${_access_token}"
-  _add_cert_result="$(_post "$_certData" "$_rest_endpoint/v3/ssl" "" "POST" "application/json")"
+  _add_cert_result="$(_post "$_certData" "https://rest.cleverreach.com/v3/ssl" "" "POST" "application/json")"
 
-  if [ -z "${DEPLOY_CLEVERREACH_SUBCLIENT_ID}" ]; then
-    _info "Destroying token at CleverReach, as it not needed anymore"
-    _destroy_result="$(_post "" "$_rest_endpoint/v3/oauth/token.json" "" "DELETE" "application/json")"
-    _debug _destroy_result "$_destroy_result"
-  fi
+  _debug "Destroying token at CleverReach"
+  _post "" "https://rest.cleverreach.com/v3/oauth/token.json" "" "DELETE" "application/json"
 
   if ! echo "$_add_cert_result" | grep '"error":' >/dev/null; then
     _info "Uploaded certificate successfully"

deploy/consul.sh

@@ -1,98 +0,0 @@
-#!/usr/bin/env sh
-
-# Here is a script to deploy cert to hashicorp consul using curl
-# (https://www.consul.io/)
-#
-# it requires following environment variables:
-#
-# CONSUL_PREFIX - this contains the prefix path in consul
-# CONSUL_HTTP_ADDR - consul requires this to find your consul server
-#
-# additionally, you need to ensure that CONSUL_HTTP_TOKEN is available
-# to access the consul server
-
-#returns 0 means success, otherwise error.
-
-########  Public functions #####################
-
-#domain keyfile certfile cafile fullchain
-consul_deploy() {
-
-  _cdomain="$1"
-  _ckey="$2"
-  _ccert="$3"
-  _cca="$4"
-  _cfullchain="$5"
-
-  _debug _cdomain "$_cdomain"
-  _debug _ckey "$_ckey"
-  _debug _ccert "$_ccert"
-  _debug _cca "$_cca"
-  _debug _cfullchain "$_cfullchain"
-
-  # validate required env vars
-  _getdeployconf CONSUL_PREFIX
-  if [ -z "$CONSUL_PREFIX" ]; then
-    _err "CONSUL_PREFIX needs to be defined (contains prefix path in vault)"
-    return 1
-  fi
-  _savedeployconf CONSUL_PREFIX "$CONSUL_PREFIX"
-
-  _getdeployconf CONSUL_HTTP_ADDR
-  if [ -z "$CONSUL_HTTP_ADDR" ]; then
-    _err "CONSUL_HTTP_ADDR needs to be defined (contains consul connection address)"
-    return 1
-  fi
-  _savedeployconf CONSUL_HTTP_ADDR "$CONSUL_HTTP_ADDR"
-
-  CONSUL_CMD=$(command -v consul)
-
-  # force CLI, but the binary does not exist => error
-  if [ -n "$USE_CLI" ] && [ -z "$CONSUL_CMD" ]; then
-    _err "Cannot find the consul binary!"
-    return 1
-  fi
-
-  # use the CLI first
-  if [ -n "$USE_CLI" ] || [ -n "$CONSUL_CMD" ]; then
-    _info "Found consul binary, deploying with CLI"
-    consul_deploy_cli "$CONSUL_CMD" "$CONSUL_PREFIX"
-  else
-    _info "Did not find consul binary, deploying with API"
-    consul_deploy_api "$CONSUL_HTTP_ADDR" "$CONSUL_PREFIX" "$CONSUL_HTTP_TOKEN"
-  fi
-}
-
-consul_deploy_api() {
-  CONSUL_HTTP_ADDR="$1"
-  CONSUL_PREFIX="$2"
-  CONSUL_HTTP_TOKEN="$3"
-
-  URL="$CONSUL_HTTP_ADDR/v1/kv/$CONSUL_PREFIX"
-  export _H1="X-Consul-Token: $CONSUL_HTTP_TOKEN"
-
-  if [ -n "$FABIO" ]; then
-    _post "$(cat "$_cfullchain")" "$URL/${_cdomain}-cert.pem" '' "PUT" || return 1
-    _post "$(cat "$_ckey")" "$URL/${_cdomain}-key.pem" '' "PUT" || return 1
-  else
-    _post "$(cat "$_ccert")" "$URL/${_cdomain}/cert.pem" '' "PUT" || return 1
-    _post "$(cat "$_ckey")" "$URL/${_cdomain}/cert.key" '' "PUT" || return 1
-    _post "$(cat "$_cca")" "$URL/${_cdomain}/chain.pem" '' "PUT" || return 1
-    _post "$(cat "$_cfullchain")" "$URL/${_cdomain}/fullchain.pem" '' "PUT" || return 1
-  fi
-}
-
-consul_deploy_cli() {
-  CONSUL_CMD="$1"
-  CONSUL_PREFIX="$2"
-
-  if [ -n "$FABIO" ]; then
-    $CONSUL_CMD kv put "${CONSUL_PREFIX}/${_cdomain}-cert.pem" @"$_cfullchain" || return 1
-    $CONSUL_CMD kv put "${CONSUL_PREFIX}/${_cdomain}-key.pem" @"$_ckey" || return 1
-  else
-    $CONSUL_CMD kv put "${CONSUL_PREFIX}/${_cdomain}/cert.pem" value=@"$_ccert" || return 1
-    $CONSUL_CMD kv put "${CONSUL_PREFIX}/${_cdomain}/cert.key" value=@"$_ckey" || return 1
-    $CONSUL_CMD kv put "${CONSUL_PREFIX}/${_cdomain}/chain.pem" value=@"$_cca" || return 1
-    $CONSUL_CMD kv put "${CONSUL_PREFIX}/${_cdomain}/fullchain.pem" value=@"$_cfullchain" || return 1
-  fi
-}

deploy/cpanel_uapi.sh

@@ -3,29 +3,18 @@
 # Uses command line uapi.  --user option is needed only if run as root.
 # Returns 0 when success.
 #
-# Configure DEPLOY_CPANEL_AUTO_<...> options to enable or restrict automatic
-# detection of deployment targets through UAPI (if not set, defaults below are used.)
-# - ENABLED : 'true' for multi-site / wildcard capability; otherwise single-site mode.
-# - NOMATCH : 'true' to allow deployment to sites that do not match the certificate.
-# - INCLUDE : Comma-separated list - sites must match this field.
-# - EXCLUDE : Comma-separated list - sites must NOT match this field.
-# INCLUDE/EXCLUDE both support non-lexical, glob-style matches using '*'
-#
 # Please note that I am no longer using Github. If you want to report an issue
 # or contact me, visit https://forum.webseodesigners.com/web-design-seo-and-hosting-f16/
 #
 # Written by Santeri Kannisto <santeri.kannisto@webseodesigners.com>
 # Public domain, 2017-2018
-#
-# export DEPLOY_CPANEL_USER=myusername
-# export DEPLOY_CPANEL_AUTO_ENABLED='true'
-# export DEPLOY_CPANEL_AUTO_NOMATCH='false'
-# export DEPLOY_CPANEL_AUTO_INCLUDE='*'
-# export DEPLOY_CPANEL_AUTO_EXCLUDE=''
+
+#export DEPLOY_CPANEL_USER=myusername
 
 ########  Public functions #####################
 
 #domain keyfile certfile cafile fullchain
+
 cpanel_uapi_deploy() {
   _cdomain="$1"
   _ckey="$2"
@@ -33,9 +22,6 @@ cpanel_uapi_deploy() {
   _cca="$4"
   _cfullchain="$5"
 
-  # re-declare vars inherited from acme.sh but not passed to make ShellCheck happy
-  : "${Le_Alt:=""}"
-
   _debug _cdomain "$_cdomain"
   _debug _ckey "$_ckey"
   _debug _ccert "$_ccert"
@@ -46,166 +32,31 @@ cpanel_uapi_deploy() {
     _err "The command uapi is not found."
     return 1
   fi
-
-  # declare useful constants
-  uapi_error_response='status: 0'
-
   # read cert and key files and urlencode both
   _cert=$(_url_encode <"$_ccert")
   _key=$(_url_encode <"$_ckey")
 
-  _debug2 _cert "$_cert"
-  _debug2 _key "$_key"
+  _debug _cert "$_cert"
+  _debug _key "$_key"
 
   if [ "$(id -u)" = 0 ]; then
-    _getdeployconf DEPLOY_CPANEL_USER
-    # fallback to _readdomainconf for old installs
-    if [ -z "${DEPLOY_CPANEL_USER:=$(_readdomainconf DEPLOY_CPANEL_USER)}" ]; then
+    if [ -z "$DEPLOY_CPANEL_USER" ]; then
       _err "It seems that you are root, please define the target user name: export DEPLOY_CPANEL_USER=username"
       return 1
     fi
-    _debug DEPLOY_CPANEL_USER "$DEPLOY_CPANEL_USER"
-    _savedeployconf DEPLOY_CPANEL_USER "$DEPLOY_CPANEL_USER"
-
-    _uapi_user="$DEPLOY_CPANEL_USER"
-  fi
-
-  # Load all AUTO envars and set defaults - see above for usage
-  __cpanel_initautoparam ENABLED 'true'
-  __cpanel_initautoparam NOMATCH 'false'
-  __cpanel_initautoparam INCLUDE '*'
-  __cpanel_initautoparam EXCLUDE ''
-
-  # Auto mode
-  if [ "$DEPLOY_CPANEL_AUTO_ENABLED" = "true" ]; then
-    # call API for site config
-    _response=$(uapi DomainInfo list_domains)
-    # exit if error in response
-    if [ -z "$_response" ] || [ "${_response#*"$uapi_error_response"}" != "$_response" ]; then
-      _err "Error in deploying certificate - cannot retrieve sitelist:"
-      _err "\n$_response"
-      return 1
-    fi
-
-    # parse response to create site list
-    sitelist=$(__cpanel_parse_response "$_response")
-    _debug "UAPI sites found: $sitelist"
-
-    # filter sitelist using configured domains
-    # skip if NOMATCH is "true"
-    if [ "$DEPLOY_CPANEL_AUTO_NOMATCH" = "true" ]; then
-      _debug "DEPLOY_CPANEL_AUTO_NOMATCH is true"
-      _info "UAPI nomatch mode is enabled - Will not validate sites are valid for the certificate"
-    else
-      _debug "DEPLOY_CPANEL_AUTO_NOMATCH is false"
-      d="$(echo "${Le_Alt}," | sed -e "s/^$_cdomain,//" -e "s/,$_cdomain,/,/")"
-      d="$(echo "$_cdomain,$d" | tr ',' '\n' | sed -e 's/\./\\./g' -e 's/\*/\[\^\.\]\*/g')"
-      sitelist="$(echo "$sitelist" | grep -ix "$d")"
-      _debug2 "Matched UAPI sites: $sitelist"
-    fi
-
-    # filter sites that do not match $DEPLOY_CPANEL_AUTO_INCLUDE
-    _info "Applying sitelist filter DEPLOY_CPANEL_AUTO_INCLUDE: $DEPLOY_CPANEL_AUTO_INCLUDE"
-    sitelist="$(echo "$sitelist" | grep -ix "$(echo "$DEPLOY_CPANEL_AUTO_INCLUDE" | tr ',' '\n' | sed -e 's/\./\\./g' -e 's/\*/\.\*/g')")"
-    _debug2 "Remaining sites: $sitelist"
-
-    # filter sites that match $DEPLOY_CPANEL_AUTO_EXCLUDE
-    _info "Applying sitelist filter DEPLOY_CPANEL_AUTO_EXCLUDE: $DEPLOY_CPANEL_AUTO_EXCLUDE"
-    sitelist="$(echo "$sitelist" | grep -vix "$(echo "$DEPLOY_CPANEL_AUTO_EXCLUDE" | tr ',' '\n' | sed -e 's/\./\\./g' -e 's/\*/\.\*/g')")"
-    _debug2 "Remaining sites: $sitelist"
-
-    # counter for success / failure check
-    successes=0
-    if [ -n "$sitelist" ]; then
-      sitetotal="$(echo "$sitelist" | wc -l)"
-      _debug "$sitetotal sites to deploy"
-    else
-      sitetotal=0
-      _debug "No sites to deploy"
-    fi
-
-    # for each site: call uapi to publish cert and log result. Only return failure if all fail
-    for site in $sitelist; do
-      # call uapi to publish cert, check response for errors and log them.
-      if [ -n "$_uapi_user" ]; then
-        _response=$(uapi --user="$_uapi_user" SSL install_ssl domain="$site" cert="$_cert" key="$_key")
-      else
-        _response=$(uapi SSL install_ssl domain="$site" cert="$_cert" key="$_key")
-      fi
-      if [ "${_response#*"$uapi_error_response"}" != "$_response" ]; then
-        _err "Error in deploying certificate to $site:"
-        _err "$_response"
-      else
-        successes=$((successes + 1))
-        _debug "$_response"
-        _info "Succcessfully deployed to $site"
-      fi
-    done
-
-    # Raise error if all updates fail
-    if [ "$sitetotal" -gt 0 ] && [ "$successes" -eq 0 ]; then
-      _err "Could not deploy to any of $sitetotal sites via UAPI"
-      _debug "successes: $successes, sitetotal: $sitetotal"
-      return 1
-    fi
-
-    _info "Successfully deployed certificate to $successes of $sitetotal sites via UAPI"
-    return 0
+    _savedomainconf DEPLOY_CPANEL_USER "$DEPLOY_CPANEL_USER"
+    _response=$(uapi --user="$DEPLOY_CPANEL_USER" SSL install_ssl domain="$_cdomain" cert="$_cert" key="$_key")
   else
-    # "classic" mode - will only try to deploy to the primary domain; will not check UAPI first
-    if [ -n "$_uapi_user" ]; then
-      _response=$(uapi --user="$_uapi_user" SSL install_ssl domain="$_cdomain" cert="$_cert" key="$_key")
-    else
-      _response=$(uapi SSL install_ssl domain="$_cdomain" cert="$_cert" key="$_key")
-    fi
-
-    if [ "${_response#*"$uapi_error_response"}" != "$_response" ]; then
-      _err "Error in deploying certificate:"
-      _err "$_response"
-      return 1
-    fi
-
-    _debug response "$_response"
-    _info "Certificate successfully deployed"
-    return 0
+    _response=$(uapi SSL install_ssl domain="$_cdomain" cert="$_cert" key="$_key")
   fi
-}
-
-########  Private functions #####################
-
-# Internal utility to process YML from UAPI - looks at main_domain, sub_domains, addon domains and parked domains
-#[response]
-__cpanel_parse_response() {
-  if [ $# -gt 0 ]; then resp="$*"; else resp="$(cat)"; fi
-
-  echo "$resp" |
-    sed -En \
-      -e 's/\r$//' \
-      -e 's/^( *)([_.[:alnum:]]+) *: *(.*)/\1,\2,\3/p' \
-      -e 's/^( *)- (.*)/\1,-,\2/p' |
-    awk -F, '{
-      level = length($1)/2;
-      section[level] = $2;
-      for (i in section) {if (i > level) {delete section[i]}}
-      if (length($3) > 0) {
-        prefix="";
-        for (i=0; i < level; i++)
-          { prefix = (prefix)(section[i])("/") }
-        printf("%s%s=%s\n", prefix, $2, $3);
-      }
-    }' |
-    sed -En -e 's/^result\/data\/(main_domain|sub_domains\/-|addon_domains\/-|parked_domains\/-)=(.*)$/\2/p'
-}
-
-# Load parameter by prefix+name - fallback to default if not set, and save to config
-#pname pdefault
-__cpanel_initautoparam() {
-  pname="$1"
-  pdefault="$2"
-  pkey="DEPLOY_CPANEL_AUTO_$pname"
-
-  _getdeployconf "$pkey"
-  [ -n "$(eval echo "\"\$$pkey\"")" ] || eval "$pkey=\"$pdefault\""
-  _debug2 "$pkey" "$(eval echo "\"\$$pkey\"")"
-  _savedeployconf "$pkey" "$(eval echo "\"\$$pkey\"")"
+  error_response="status: 0"
+  if test "${_response#*$error_response}" != "$_response"; then
+    _err "Error in deploying certificate:"
+    _err "$_response"
+    return 1
+  fi
+
+  _debug response "$_response"
+  _info "Certificate successfully deployed"
+  return 0
 }

deploy/docker.sh

@@ -273,27 +273,16 @@ _check_curl_version() {
   _minor="$(_getfield "$_cversion" 2 '.')"
   _debug2 "_minor" "$_minor"
 
-  if [ "$_major" -ge "8" ]; then
-    #ok
-    return 0
-  fi
-  if [ "$_major" = "7" ]; then
-    if [ "$_minor" -lt "40" ]; then
-      _err "curl v$_cversion doesn't support unit socket"
-      _err "Please upgrade to curl 7.40 or later."
-      return 1
-    fi
-    if [ "$_minor" -lt "50" ]; then
-      _debug "Use short host name"
-      export _CURL_NO_HOST=1
-    else
-      export _CURL_NO_HOST=
-    fi
-    return 0
-  else
+  if [ "$_major$_minor" -lt "740" ]; then
     _err "curl v$_cversion doesn't support unit socket"
     _err "Please upgrade to curl 7.40 or later."
     return 1
   fi
-
+  if [ "$_major$_minor" -lt "750" ]; then
+    _debug "Use short host name"
+    export _CURL_NO_HOST=1
+  else
+    export _CURL_NO_HOST=
+  fi
+  return 0
 }

deploy/exim4.sh

@@ -109,5 +109,6 @@ exim4_deploy() {
     fi
     return 1
   fi
+  return 0
 
 }

deploy/fritzbox.sh

@@ -36,51 +36,43 @@ fritzbox_deploy() {
     fi
   fi
 
-  # Clear traces of incorrectly stored values
-  _clearaccountconf DEPLOY_FRITZBOX_USERNAME
-  _clearaccountconf DEPLOY_FRITZBOX_PASSWORD
-  _clearaccountconf DEPLOY_FRITZBOX_URL
+  _fritzbox_username="${DEPLOY_FRITZBOX_USERNAME}"
+  _fritzbox_password="${DEPLOY_FRITZBOX_PASSWORD}"
+  _fritzbox_url="${DEPLOY_FRITZBOX_URL}"
 
-  # Read config from saved values or env
-  _getdeployconf DEPLOY_FRITZBOX_USERNAME
-  _getdeployconf DEPLOY_FRITZBOX_PASSWORD
-  _getdeployconf DEPLOY_FRITZBOX_URL
-
-  _debug DEPLOY_FRITZBOX_URL "$DEPLOY_FRITZBOX_URL"
-  _debug DEPLOY_FRITZBOX_USERNAME "$DEPLOY_FRITZBOX_USERNAME"
-  _secure_debug DEPLOY_FRITZBOX_PASSWORD "$DEPLOY_FRITZBOX_PASSWORD"
-
-  if [ -z "$DEPLOY_FRITZBOX_USERNAME" ]; then
+  _debug _fritzbox_url "$_fritzbox_url"
+  _debug _fritzbox_username "$_fritzbox_username"
+  _secure_debug _fritzbox_password "$_fritzbox_password"
+  if [ -z "$_fritzbox_username" ]; then
     _err "FRITZ!Box username is not found, please define DEPLOY_FRITZBOX_USERNAME."
     return 1
   fi
-  if [ -z "$DEPLOY_FRITZBOX_PASSWORD" ]; then
+  if [ -z "$_fritzbox_password" ]; then
     _err "FRITZ!Box password is not found, please define DEPLOY_FRITZBOX_PASSWORD."
     return 1
   fi
-  if [ -z "$DEPLOY_FRITZBOX_URL" ]; then
+  if [ -z "$_fritzbox_url" ]; then
     _err "FRITZ!Box url is not found, please define DEPLOY_FRITZBOX_URL."
     return 1
   fi
 
-  # Save current values
-  _savedeployconf DEPLOY_FRITZBOX_USERNAME "$DEPLOY_FRITZBOX_USERNAME"
-  _savedeployconf DEPLOY_FRITZBOX_PASSWORD "$DEPLOY_FRITZBOX_PASSWORD"
-  _savedeployconf DEPLOY_FRITZBOX_URL "$DEPLOY_FRITZBOX_URL"
+  _saveaccountconf DEPLOY_FRITZBOX_USERNAME "${_fritzbox_username}"
+  _saveaccountconf DEPLOY_FRITZBOX_PASSWORD "${_fritzbox_password}"
+  _saveaccountconf DEPLOY_FRITZBOX_URL "${_fritzbox_url}"
 
   # Do not check for a valid SSL certificate, because initially the cert is not valid, so it could not install the LE generated certificate
   export HTTPS_INSECURE=1
 
   _info "Log in to the FRITZ!Box"
-  _fritzbox_challenge="$(_get "${DEPLOY_FRITZBOX_URL}/login_sid.lua" | sed -e 's/^.*<Challenge>//' -e 's/<\/Challenge>.*$//')"
+  _fritzbox_challenge="$(_get "${_fritzbox_url}/login_sid.lua" | sed -e 's/^.*<Challenge>//' -e 's/<\/Challenge>.*$//')"
   if _exists iconv; then
-    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${DEPLOY_FRITZBOX_PASSWORD}" | iconv -f ASCII -t UTF16LE | _digest md5 hex)"
+    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${_fritzbox_password}" | iconv -f ASCII -t UTF16LE | _digest md5 hex)"
   elif _exists uconv; then
-    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${DEPLOY_FRITZBOX_PASSWORD}" | uconv -f ASCII -t UTF16LE | _digest md5 hex)"
+    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${_fritzbox_password}" | uconv -f ASCII -t UTF16LE | _digest md5 hex)"
   else
-    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${DEPLOY_FRITZBOX_PASSWORD}" | perl -p -e 'use Encode qw/encode/; print encode("UTF-16LE","$_"); $_="";' | _digest md5 hex)"
+    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${_fritzbox_password}" | perl -p -e 'use Encode qw/encode/; print encode("UTF-16LE","$_"); $_="";' | _digest md5 hex)"
   fi
-  _fritzbox_sid="$(_get "${DEPLOY_FRITZBOX_URL}/login_sid.lua?sid=0000000000000000&username=${DEPLOY_FRITZBOX_USERNAME}&response=${_fritzbox_challenge}-${_fritzbox_hash}" | sed -e 's/^.*<SID>//' -e 's/<\/SID>.*$//')"
+  _fritzbox_sid="$(_get "${_fritzbox_url}/login_sid.lua?sid=0000000000000000&username=${_fritzbox_username}&response=${_fritzbox_challenge}-${_fritzbox_hash}" | sed -e 's/^.*<SID>//' -e 's/<\/SID>.*$//')"
 
   if [ -z "${_fritzbox_sid}" ] || [ "${_fritzbox_sid}" = "0000000000000000" ]; then
     _err "Logging in to the FRITZ!Box failed. Please check username, password and URL."
@@ -112,7 +104,7 @@ fritzbox_deploy() {
   _info "Upload certificate to the FRITZ!Box"
 
   export _H1="Content-type: multipart/form-data boundary=${_post_boundary}"
-  _post "$(cat "${_post_request}")" "${DEPLOY_FRITZBOX_URL}/cgi-bin/firmwarecfg" | grep SSL
+  _post "$(cat "${_post_request}")" "${_fritzbox_url}/cgi-bin/firmwarecfg" | grep SSL
 
   retval=$?
   if [ $retval = 0 ]; then

deploy/gcore_cdn.sh

@@ -1,11 +1,10 @@
 #!/usr/bin/env sh
 
-# Here is the script to deploy the cert to G-Core CDN service (https://gcore.com/) using the G-Core Labs API (https://apidocs.gcore.com/cdn).
+# Here is the script to deploy the cert to G-Core CDN service (https://gcorelabs.com/ru/) using the G-Core Labs API (https://docs.gcorelabs.com/cdn/).
 # Returns 0 when success.
 #
 # Written by temoffey <temofffey@gmail.com>
 # Public domain, 2019
-# Update by DreamOfIce <admin@dreamofice.cn> in 2023
 
 #export DEPLOY_GCORE_CDN_USERNAME=myusername
 #export DEPLOY_GCORE_CDN_PASSWORD=mypassword
@@ -57,9 +56,9 @@ gcore_cdn_deploy() {
   _request="{\"username\":\"$Le_Deploy_gcore_cdn_username\",\"password\":\"$Le_Deploy_gcore_cdn_password\"}"
   _debug _request "$_request"
   export _H1="Content-Type:application/json"
-  _response=$(_post "$_request" "https://api.gcore.com/auth/jwt/login")
+  _response=$(_post "$_request" "https://api.gcdn.co/auth/signin")
   _debug _response "$_response"
-  _regex=".*\"access\":\"\([-._0-9A-Za-z]*\)\".*$"
+  _regex=".*\"token\":\"\([-._0-9A-Za-z]*\)\".*$"
   _debug _regex "$_regex"
   _token=$(echo "$_response" | sed -n "s/$_regex/\1/p")
   _debug _token "$_token"
@@ -70,18 +69,15 @@ gcore_cdn_deploy() {
   fi
 
   _info "Find CDN resource with cname $_cdomain"
-  export _H2="Authorization:Bearer $_token"
-  _response=$(_get "https://api.gcore.com/cdn/resources")
-  _debug _response "$_response"
-  _regex="\"primary_resource\":null},"
-  _debug _regex "$_regex"
-  _response=$(echo "$_response" | sed "s/$_regex/$_regex\n/g")
+  export _H2="Authorization:Token $_token"
+  _response=$(_get "https://api.gcdn.co/resources")
   _debug _response "$_response"
+  _regex=".*(\"id\".*?\"cname\":\"$_cdomain\".*?})"
   _regex="^.*\"cname\":\"$_cdomain\".*$"
   _debug _regex "$_regex"
-  _resource=$(echo "$_response" | _egrep_o "$_regex")
+  _resource=$(echo "$_response" | sed 's/},{/},\n{/g' | _egrep_o "$_regex")
   _debug _resource "$_resource"
-  _regex=".*\"id\":\([0-9]*\).*$"
+  _regex=".*\"id\":\([0-9]*\).*\"rules\".*$"
   _debug _regex "$_regex"
   _resourceId=$(echo "$_resource" | sed -n "s/$_regex/\1/p")
   _debug _resourceId "$_resourceId"
@@ -103,7 +99,7 @@ gcore_cdn_deploy() {
   _date=$(date "+%d.%m.%Y %H:%M:%S")
   _request="{\"name\":\"$_cdomain ($_date)\",\"sslCertificate\":\"$_fullchain\",\"sslPrivateKey\":\"$_key\"}"
   _debug _request "$_request"
-  _response=$(_post "$_request" "https://api.gcore.com/cdn/sslData")
+  _response=$(_post "$_request" "https://api.gcdn.co/sslData")
   _debug _response "$_response"
   _regex=".*\"id\":\([0-9]*\).*$"
   _debug _regex "$_regex"
@@ -118,7 +114,7 @@ gcore_cdn_deploy() {
   _info "Update CDN resource"
   _request="{\"originGroup\":$_originGroup,\"sslData\":$_sslDataAdd}"
   _debug _request "$_request"
-  _response=$(_post "$_request" "https://api.gcore.com/cdn/resources/$_resourceId" '' "PUT")
+  _response=$(_post "$_request" "https://api.gcdn.co/resources/$_resourceId" '' "PUT")
   _debug _response "$_response"
   _regex=".*\"sslData\":\([0-9]*\).*$"
   _debug _regex "$_regex"
@@ -134,7 +130,7 @@ gcore_cdn_deploy() {
     _info "Not found old SSL certificate"
   else
     _info "Delete old SSL certificate"
-    _response=$(_post '' "https://api.gcore.com/cdn/sslData/$_sslDataOld" '' "DELETE")
+    _response=$(_post '' "https://api.gcdn.co/sslData/$_sslDataOld" '' "DELETE")
     _debug _response "$_response"
   fi
 

deploy/gitlab.sh

@@ -67,7 +67,7 @@ gitlab_deploy() {
 
   error_response="error"
 
-  if test "${_response#*"$error_response"}" != "$_response"; then
+  if test "${_response#*$error_response}" != "$_response"; then
     _err "Error in deploying certificate:"
     _err "$_response"
     return 1

deploy/haproxy.sh

@@ -36,19 +36,6 @@
 # Note: This functionality requires HAProxy was compiled against
 # a version of OpenSSL that supports this.
 #
-# export DEPLOY_HAPROXY_HOT_UPDATE="yes"
-# export DEPLOY_HAPROXY_STATS_SOCKET="UNIX:/run/haproxy/admin.sock"
-#
-# OPTIONAL: Deploy the certificate over the HAProxy stats socket without
-# needing to reload HAProxy. Default is "no".
-#
-# Require the socat binary. DEPLOY_HAPROXY_STATS_SOCKET variable uses the socat
-# address format.
-#
-# export DEPLOY_HAPROXY_MASTER_CLI="UNIX:/run/haproxy-master.sock"
-#
-# OPTIONAL: To use the master CLI with DEPLOY_HAPROXY_HOT_UPDATE="yes" instead
-# of a stats socket, use this variable.
 
 ########  Public functions #####################
 
@@ -59,7 +46,6 @@ haproxy_deploy() {
   _ccert="$3"
   _cca="$4"
   _cfullchain="$5"
-  _cmdpfx=""
 
   # Some defaults
   DEPLOY_HAPROXY_PEM_PATH_DEFAULT="/etc/haproxy"
@@ -67,8 +53,11 @@ haproxy_deploy() {
   DEPLOY_HAPROXY_BUNDLE_DEFAULT="no"
   DEPLOY_HAPROXY_ISSUER_DEFAULT="no"
   DEPLOY_HAPROXY_RELOAD_DEFAULT="true"
-  DEPLOY_HAPROXY_HOT_UPDATE_DEFAULT="no"
-  DEPLOY_HAPROXY_STATS_SOCKET_DEFAULT="UNIX:/run/haproxy/admin.sock"
+
+  if [ -f "${DOMAIN_CONF}" ]; then
+    # shellcheck disable=SC1090
+    . "${DOMAIN_CONF}"
+  fi
 
   _debug _cdomain "${_cdomain}"
   _debug _ckey "${_ckey}"
@@ -77,8 +66,6 @@ haproxy_deploy() {
   _debug _cfullchain "${_cfullchain}"
 
   # PEM_PATH is optional. If not provided then assume "${DEPLOY_HAPROXY_PEM_PATH_DEFAULT}"
-  _getdeployconf DEPLOY_HAPROXY_PEM_PATH
-  _debug2 DEPLOY_HAPROXY_PEM_PATH "${DEPLOY_HAPROXY_PEM_PATH}"
   if [ -n "${DEPLOY_HAPROXY_PEM_PATH}" ]; then
     Le_Deploy_haproxy_pem_path="${DEPLOY_HAPROXY_PEM_PATH}"
     _savedomainconf Le_Deploy_haproxy_pem_path "${Le_Deploy_haproxy_pem_path}"
@@ -95,23 +82,14 @@ haproxy_deploy() {
   fi
 
   # PEM_NAME is optional. If not provided then assume "${DEPLOY_HAPROXY_PEM_NAME_DEFAULT}"
-  _getdeployconf DEPLOY_HAPROXY_PEM_NAME
-  _debug2 DEPLOY_HAPROXY_PEM_NAME "${DEPLOY_HAPROXY_PEM_NAME}"
   if [ -n "${DEPLOY_HAPROXY_PEM_NAME}" ]; then
     Le_Deploy_haproxy_pem_name="${DEPLOY_HAPROXY_PEM_NAME}"
     _savedomainconf Le_Deploy_haproxy_pem_name "${Le_Deploy_haproxy_pem_name}"
   elif [ -z "${Le_Deploy_haproxy_pem_name}" ]; then
     Le_Deploy_haproxy_pem_name="${DEPLOY_HAPROXY_PEM_NAME_DEFAULT}"
-    # We better not have '*' as the first character
-    if [ "${Le_Deploy_haproxy_pem_name%%"${Le_Deploy_haproxy_pem_name#?}"}" = '*' ]; then
-      # removes the first characters and add a _ instead
-      Le_Deploy_haproxy_pem_name="_${Le_Deploy_haproxy_pem_name#?}"
-    fi
   fi
 
   # BUNDLE is optional. If not provided then assume "${DEPLOY_HAPROXY_BUNDLE_DEFAULT}"
-  _getdeployconf DEPLOY_HAPROXY_BUNDLE
-  _debug2 DEPLOY_HAPROXY_BUNDLE "${DEPLOY_HAPROXY_BUNDLE}"
   if [ -n "${DEPLOY_HAPROXY_BUNDLE}" ]; then
     Le_Deploy_haproxy_bundle="${DEPLOY_HAPROXY_BUNDLE}"
     _savedomainconf Le_Deploy_haproxy_bundle "${Le_Deploy_haproxy_bundle}"
@@ -120,8 +98,6 @@ haproxy_deploy() {
   fi
 
   # ISSUER is optional. If not provided then assume "${DEPLOY_HAPROXY_ISSUER_DEFAULT}"
-  _getdeployconf DEPLOY_HAPROXY_ISSUER
-  _debug2 DEPLOY_HAPROXY_ISSUER "${DEPLOY_HAPROXY_ISSUER}"
   if [ -n "${DEPLOY_HAPROXY_ISSUER}" ]; then
     Le_Deploy_haproxy_issuer="${DEPLOY_HAPROXY_ISSUER}"
     _savedomainconf Le_Deploy_haproxy_issuer "${Le_Deploy_haproxy_issuer}"
@@ -130,8 +106,6 @@ haproxy_deploy() {
   fi
 
   # RELOAD is optional. If not provided then assume "${DEPLOY_HAPROXY_RELOAD_DEFAULT}"
-  _getdeployconf DEPLOY_HAPROXY_RELOAD
-  _debug2 DEPLOY_HAPROXY_RELOAD "${DEPLOY_HAPROXY_RELOAD}"
   if [ -n "${DEPLOY_HAPROXY_RELOAD}" ]; then
     Le_Deploy_haproxy_reload="${DEPLOY_HAPROXY_RELOAD}"
     _savedomainconf Le_Deploy_haproxy_reload "${Le_Deploy_haproxy_reload}"
@@ -139,36 +113,6 @@ haproxy_deploy() {
     Le_Deploy_haproxy_reload="${DEPLOY_HAPROXY_RELOAD_DEFAULT}"
   fi
 
-  # HOT_UPDATE is optional. If not provided then assume "${DEPLOY_HAPROXY_HOT_UPDATE_DEFAULT}"
-  _getdeployconf DEPLOY_HAPROXY_HOT_UPDATE
-  _debug2 DEPLOY_HAPROXY_HOT_UPDATE "${DEPLOY_HAPROXY_HOT_UPDATE}"
-  if [ -n "${DEPLOY_HAPROXY_HOT_UPDATE}" ]; then
-    Le_Deploy_haproxy_hot_update="${DEPLOY_HAPROXY_HOT_UPDATE}"
-    _savedomainconf Le_Deploy_haproxy_hot_update "${Le_Deploy_haproxy_hot_update}"
-  elif [ -z "${Le_Deploy_haproxy_hot_update}" ]; then
-    Le_Deploy_haproxy_hot_update="${DEPLOY_HAPROXY_HOT_UPDATE_DEFAULT}"
-  fi
-
-  # STATS_SOCKET is optional. If not provided then assume "${DEPLOY_HAPROXY_STATS_SOCKET_DEFAULT}"
-  _getdeployconf DEPLOY_HAPROXY_STATS_SOCKET
-  _debug2 DEPLOY_HAPROXY_STATS_SOCKET "${DEPLOY_HAPROXY_STATS_SOCKET}"
-  if [ -n "${DEPLOY_HAPROXY_STATS_SOCKET}" ]; then
-    Le_Deploy_haproxy_stats_socket="${DEPLOY_HAPROXY_STATS_SOCKET}"
-    _savedomainconf Le_Deploy_haproxy_stats_socket "${Le_Deploy_haproxy_stats_socket}"
-  elif [ -z "${Le_Deploy_haproxy_stats_socket}" ]; then
-    Le_Deploy_haproxy_stats_socket="${DEPLOY_HAPROXY_STATS_SOCKET_DEFAULT}"
-  fi
-
-  # MASTER_CLI is optional. No defaults are used. When the master CLI is used,
-  # all commands are sent with a prefix.
-  _getdeployconf DEPLOY_HAPROXY_MASTER_CLI
-  _debug2 DEPLOY_HAPROXY_MASTER_CLI "${DEPLOY_HAPROXY_MASTER_CLI}"
-  if [ -n "${DEPLOY_HAPROXY_MASTER_CLI}" ]; then
-    Le_Deploy_haproxy_stats_socket="${DEPLOY_HAPROXY_MASTER_CLI}"
-    _savedomainconf Le_Deploy_haproxy_stats_socket "${Le_Deploy_haproxy_stats_socket}"
-    _cmdpfx="@1 " # command prefix used for master CLI only.
-  fi
-
   # Set the suffix depending if we are creating a bundle or not
   if [ "${Le_Deploy_haproxy_bundle}" = "yes" ]; then
     _info "Bundle creation requested"
@@ -193,13 +137,12 @@ haproxy_deploy() {
   _issuer="${_pem}.issuer"
   _ocsp="${_pem}.ocsp"
   _reload="${Le_Deploy_haproxy_reload}"
-  _statssock="${Le_Deploy_haproxy_stats_socket}"
 
   _info "Deploying PEM file"
   # Create a temporary PEM file
   _temppem="$(_mktemp)"
   _debug _temppem "${_temppem}"
-  cat "${_ccert}" "${_cca}" "${_ckey}" | grep . >"${_temppem}"
+  cat "${_ckey}" "${_ccert}" "${_cca}" >"${_temppem}"
   _ret="$?"
 
   # Check that we could create the temporary file
@@ -247,7 +190,7 @@ haproxy_deploy() {
     _info "Updating OCSP stapling info"
     _debug _ocsp "${_ocsp}"
     _info "Extracting OCSP URL"
-    _ocsp_url=$(${ACME_OPENSSL_BIN:-openssl} x509 -noout -ocsp_uri -in "${_pem}")
+    _ocsp_url=$(openssl x509 -noout -ocsp_uri -in "${_pem}")
     _debug _ocsp_url "${_ocsp_url}"
 
     # Only process OCSP if URL was present
@@ -260,9 +203,9 @@ haproxy_deploy() {
       # Only process the certificate if we have a .issuer file
       if [ -r "${_issuer}" ]; then
         # Check if issuer cert is also a root CA cert
-        _subjectdn=$(${ACME_OPENSSL_BIN:-openssl} x509 -in "${_issuer}" -subject -noout | cut -d'/' -f2,3,4,5,6,7,8,9,10)
+        _subjectdn=$(openssl x509 -in "${_issuer}" -subject -noout | cut -d'/' -f2,3,4,5,6,7,8,9,10)
         _debug _subjectdn "${_subjectdn}"
-        _issuerdn=$(${ACME_OPENSSL_BIN:-openssl} x509 -in "${_issuer}" -issuer -noout | cut -d'/' -f2,3,4,5,6,7,8,9,10)
+        _issuerdn=$(openssl x509 -in "${_issuer}" -issuer -noout | cut -d'/' -f2,3,4,5,6,7,8,9,10)
         _debug _issuerdn "${_issuerdn}"
         _info "Requesting OCSP response"
         # If the issuer is a CA cert then our command line has "-CAfile" added
@@ -273,7 +216,7 @@ haproxy_deploy() {
         fi
         _debug _cafile_argument "${_cafile_argument}"
         # if OpenSSL/LibreSSL is v1.1 or above, the format for the -header option has changed
-        _openssl_version=$(${ACME_OPENSSL_BIN:-openssl} version | cut -d' ' -f2)
+        _openssl_version=$(openssl version | cut -d' ' -f2)
         _debug _openssl_version "${_openssl_version}"
         _openssl_major=$(echo "${_openssl_version}" | cut -d '.' -f1)
         _openssl_minor=$(echo "${_openssl_version}" | cut -d '.' -f2)
@@ -283,7 +226,7 @@ haproxy_deploy() {
           _header_sep=" "
         fi
         # Request the OCSP response from the issuer and store it
-        _openssl_ocsp_cmd="${ACME_OPENSSL_BIN:-openssl} ocsp \
+        _openssl_ocsp_cmd="openssl ocsp \
           -issuer \"${_issuer}\" \
           -cert \"${_pem}\" \
           -url \"${_ocsp_url}\" \
@@ -317,86 +260,15 @@ haproxy_deploy() {
     fi
   fi
 
-  if [ "${Le_Deploy_haproxy_hot_update}" = "yes" ]; then
-    # set the socket name for messages
-    if [ -n "${_cmdpfx}" ]; then
-      _socketname="master CLI"
-    else
-      _socketname="stats socket"
-    fi
-
-    # Update certificate over HAProxy stats socket or master CLI.
-    if _exists socat; then
-      # look for the certificate on the stats socket, to chose between updating or creating one
-      _socat_cert_cmd="echo '${_cmdpfx}show ssl cert' | socat '${_statssock}' - | grep -q '^${_pem}$'"
-      _debug _socat_cert_cmd "${_socat_cert_cmd}"
-      eval "${_socat_cert_cmd}"
-      _ret=$?
-      if [ "${_ret}" != "0" ]; then
-        _newcert="1"
-        _info "Creating new certificate '${_pem}' over HAProxy ${_socketname}."
-        # certificate wasn't found, it's a new one. We should check if the crt-list exists and creates/inserts the certificate.
-        _socat_crtlist_show_cmd="echo '${_cmdpfx}show ssl crt-list' | socat '${_statssock}' - | grep -q '^${Le_Deploy_haproxy_pem_path}$'"
-        _debug _socat_crtlist_show_cmd "${_socat_crtlist_show_cmd}"
-        eval "${_socat_crtlist_show_cmd}"
-        _ret=$?
-        if [ "${_ret}" != "0" ]; then
-          _err "Couldn't find '${Le_Deploy_haproxy_pem_path}' in haproxy 'show ssl crt-list'"
-          return "${_ret}"
-        fi
-        # create a new certificate
-        _socat_new_cmd="echo '${_cmdpfx}new ssl cert ${_pem}' | socat '${_statssock}' - | grep -q 'New empty'"
-        _debug _socat_new_cmd "${_socat_new_cmd}"
-        eval "${_socat_new_cmd}"
-        _ret=$?
-        if [ "${_ret}" != "0" ]; then
-          _err "Couldn't create '${_pem}' in haproxy"
-          return "${_ret}"
-        fi
-      else
-        _info "Update existing certificate '${_pem}' over HAProxy ${_socketname}."
-      fi
-      _socat_cert_set_cmd="echo -e '${_cmdpfx}set ssl cert ${_pem} <<\n$(cat "${_pem}")\n' | socat '${_statssock}' - | grep -q 'Transaction created'"
-      _debug _socat_cert_set_cmd "${_socat_cert_set_cmd}"
-      eval "${_socat_cert_set_cmd}"
-      _ret=$?
-      if [ "${_ret}" != "0" ]; then
-        _err "Can't update '${_pem}' in haproxy"
-        return "${_ret}"
-      fi
-      _socat_cert_commit_cmd="echo '${_cmdpfx}commit ssl cert ${_pem}' | socat '${_statssock}' - | grep -q '^Success!$'"
-      _debug _socat_cert_commit_cmd "${_socat_cert_commit_cmd}"
-      eval "${_socat_cert_commit_cmd}"
-      _ret=$?
-      if [ "${_ret}" != "0" ]; then
-        _err "Can't commit '${_pem}' in haproxy"
-        return ${_ret}
-      fi
-      if [ "${_newcert}" = "1" ]; then
-        # if this is a new certificate, it needs to be inserted into the crt-list`
-        _socat_cert_add_cmd="echo '${_cmdpfx}add ssl crt-list ${Le_Deploy_haproxy_pem_path} ${_pem}' | socat '${_statssock}' - | grep -q 'Success!'"
-        _debug _socat_cert_add_cmd "${_socat_cert_add_cmd}"
-        eval "${_socat_cert_add_cmd}"
-        _ret=$?
-        if [ "${_ret}" != "0" ]; then
-          _err "Can't update '${_pem}' in haproxy"
-          return "${_ret}"
-        fi
-      fi
-    else
-      _err "'socat' is not available, couldn't update over ${_socketname}"
-    fi
+  # Reload HAProxy
+  _debug _reload "${_reload}"
+  eval "${_reload}"
+  _ret=$?
+  if [ "${_ret}" != "0" ]; then
+    _err "Error code ${_ret} during reload"
+    return ${_ret}
   else
-    # Reload HAProxy
-    _debug _reload "${_reload}"
-    eval "${_reload}"
-    _ret=$?
-    if [ "${_ret}" != "0" ]; then
-      _err "Error code ${_ret} during reload"
-      return ${_ret}
-    else
-      _info "Reload successful"
-    fi
+    _info "Reload successful"
   fi
 
   return 0

deploy/kong.sh

@@ -45,7 +45,7 @@ kong_deploy() {
   #Generate data for request (Multipart/form-data with mixed content)
   if [ -z "$ssl_uuid" ]; then
     #set sni to domain
-    content="--$delim${nl}Content-Disposition: form-data; name=\"snis[]\"${nl}${nl}$_cdomain"
+    content="--$delim${nl}Content-Disposition: form-data; name=\"snis\"${nl}${nl}$_cdomain"
   fi
   #add key
   content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"key\"; filename=\"$(basename "$_ckey")\"${nl}Content-Type: application/octet-stream${nl}${nl}$(cat "$_ckey")"

deploy/lighttpd.sh

@@ -1,280 +0,0 @@
-#!/usr/bin/env sh
-
-# Script for acme.sh to deploy certificates to lighttpd
-#
-# The following variables can be exported:
-#
-# export DEPLOY_LIGHTTPD_PEM_NAME="${domain}.pem"
-#
-# Defines the name of the PEM file.
-# Defaults to "<domain>.pem"
-#
-# export DEPLOY_LIGHTTPD_PEM_PATH="/etc/lighttpd"
-#
-# Defines location of PEM file for Lighttpd.
-# Defaults to /etc/lighttpd
-#
-# export DEPLOY_LIGHTTPD_RELOAD="systemctl reload lighttpd"
-#
-# OPTIONAL: Reload command used post deploy
-# This defaults to be a no-op (ie "true").
-# It is strongly recommended to set this something that makes sense
-# for your distro.
-#
-# export DEPLOY_LIGHTTPD_ISSUER="yes"
-#
-# OPTIONAL: Places CA file as "${DEPLOY_LIGHTTPD_PEM}.issuer"
-# Note: Required for OCSP stapling to work
-#
-# export DEPLOY_LIGHTTPD_BUNDLE="no"
-#
-# OPTIONAL: Deploy this certificate as part of a multi-cert bundle
-# This adds a suffix to the certificate based on the certificate type
-# eg RSA certificates will have .rsa as a suffix to the file name
-# Lighttpd will load all certificates and provide one or the other
-# depending on client capabilities
-# Note: This functionality requires Lighttpd was compiled against
-# a version of OpenSSL that supports this.
-#
-
-########  Public functions #####################
-
-#domain keyfile certfile cafile fullchain
-lighttpd_deploy() {
-  _cdomain="$1"
-  _ckey="$2"
-  _ccert="$3"
-  _cca="$4"
-  _cfullchain="$5"
-
-  # Some defaults
-  DEPLOY_LIGHTTPD_PEM_PATH_DEFAULT="/etc/lighttpd"
-  DEPLOY_LIGHTTPD_PEM_NAME_DEFAULT="${_cdomain}.pem"
-  DEPLOY_LIGHTTPD_BUNDLE_DEFAULT="no"
-  DEPLOY_LIGHTTPD_ISSUER_DEFAULT="yes"
-  DEPLOY_LIGHTTPD_RELOAD_DEFAULT="true"
-
-  _debug _cdomain "${_cdomain}"
-  _debug _ckey "${_ckey}"
-  _debug _ccert "${_ccert}"
-  _debug _cca "${_cca}"
-  _debug _cfullchain "${_cfullchain}"
-
-  # PEM_PATH is optional. If not provided then assume "${DEPLOY_LIGHTTPD_PEM_PATH_DEFAULT}"
-  _getdeployconf DEPLOY_LIGHTTPD_PEM_PATH
-  _debug2 DEPLOY_LIGHTTPD_PEM_PATH "${DEPLOY_LIGHTTPD_PEM_PATH}"
-  if [ -n "${DEPLOY_LIGHTTPD_PEM_PATH}" ]; then
-    Le_Deploy_lighttpd_pem_path="${DEPLOY_LIGHTTPD_PEM_PATH}"
-    _savedomainconf Le_Deploy_lighttpd_pem_path "${Le_Deploy_lighttpd_pem_path}"
-  elif [ -z "${Le_Deploy_lighttpd_pem_path}" ]; then
-    Le_Deploy_lighttpd_pem_path="${DEPLOY_LIGHTTPD_PEM_PATH_DEFAULT}"
-  fi
-
-  # Ensure PEM_PATH exists
-  if [ -d "${Le_Deploy_lighttpd_pem_path}" ]; then
-    _debug "PEM_PATH ${Le_Deploy_lighttpd_pem_path} exists"
-  else
-    _err "PEM_PATH ${Le_Deploy_lighttpd_pem_path} does not exist"
-    return 1
-  fi
-
-  # PEM_NAME is optional. If not provided then assume "${DEPLOY_LIGHTTPD_PEM_NAME_DEFAULT}"
-  _getdeployconf DEPLOY_LIGHTTPD_PEM_NAME
-  _debug2 DEPLOY_LIGHTTPD_PEM_NAME "${DEPLOY_LIGHTTPD_PEM_NAME}"
-  if [ -n "${DEPLOY_LIGHTTPD_PEM_NAME}" ]; then
-    Le_Deploy_lighttpd_pem_name="${DEPLOY_LIGHTTPD_PEM_NAME}"
-    _savedomainconf Le_Deploy_lighttpd_pem_name "${Le_Deploy_lighttpd_pem_name}"
-  elif [ -z "${Le_Deploy_lighttpd_pem_name}" ]; then
-    Le_Deploy_lighttpd_pem_name="${DEPLOY_LIGHTTPD_PEM_NAME_DEFAULT}"
-  fi
-
-  # BUNDLE is optional. If not provided then assume "${DEPLOY_LIGHTTPD_BUNDLE_DEFAULT}"
-  _getdeployconf DEPLOY_LIGHTTPD_BUNDLE
-  _debug2 DEPLOY_LIGHTTPD_BUNDLE "${DEPLOY_LIGHTTPD_BUNDLE}"
-  if [ -n "${DEPLOY_LIGHTTPD_BUNDLE}" ]; then
-    Le_Deploy_lighttpd_bundle="${DEPLOY_LIGHTTPD_BUNDLE}"
-    _savedomainconf Le_Deploy_lighttpd_bundle "${Le_Deploy_lighttpd_bundle}"
-  elif [ -z "${Le_Deploy_lighttpd_bundle}" ]; then
-    Le_Deploy_lighttpd_bundle="${DEPLOY_LIGHTTPD_BUNDLE_DEFAULT}"
-  fi
-
-  # ISSUER is optional. If not provided then assume "${DEPLOY_LIGHTTPD_ISSUER_DEFAULT}"
-  _getdeployconf DEPLOY_LIGHTTPD_ISSUER
-  _debug2 DEPLOY_LIGHTTPD_ISSUER "${DEPLOY_LIGHTTPD_ISSUER}"
-  if [ -n "${DEPLOY_LIGHTTPD_ISSUER}" ]; then
-    Le_Deploy_lighttpd_issuer="${DEPLOY_LIGHTTPD_ISSUER}"
-    _savedomainconf Le_Deploy_lighttpd_issuer "${Le_Deploy_lighttpd_issuer}"
-  elif [ -z "${Le_Deploy_lighttpd_issuer}" ]; then
-    Le_Deploy_lighttpd_issuer="${DEPLOY_LIGHTTPD_ISSUER_DEFAULT}"
-  fi
-
-  # RELOAD is optional. If not provided then assume "${DEPLOY_LIGHTTPD_RELOAD_DEFAULT}"
-  _getdeployconf DEPLOY_LIGHTTPD_RELOAD
-  _debug2 DEPLOY_LIGHTTPD_RELOAD "${DEPLOY_LIGHTTPD_RELOAD}"
-  if [ -n "${DEPLOY_LIGHTTPD_RELOAD}" ]; then
-    Le_Deploy_lighttpd_reload="${DEPLOY_LIGHTTPD_RELOAD}"
-    _savedomainconf Le_Deploy_lighttpd_reload "${Le_Deploy_lighttpd_reload}"
-  elif [ -z "${Le_Deploy_lighttpd_reload}" ]; then
-    Le_Deploy_lighttpd_reload="${DEPLOY_LIGHTTPD_RELOAD_DEFAULT}"
-  fi
-
-  # Set the suffix depending if we are creating a bundle or not
-  if [ "${Le_Deploy_lighttpd_bundle}" = "yes" ]; then
-    _info "Bundle creation requested"
-    # Initialise $Le_Keylength if its not already set
-    if [ -z "${Le_Keylength}" ]; then
-      Le_Keylength=""
-    fi
-    if _isEccKey "${Le_Keylength}"; then
-      _info "ECC key type detected"
-      _suffix=".ecdsa"
-    else
-      _info "RSA key type detected"
-      _suffix=".rsa"
-    fi
-  else
-    _suffix=""
-  fi
-  _debug _suffix "${_suffix}"
-
-  # Set variables for later
-  _pem="${Le_Deploy_lighttpd_pem_path}/${Le_Deploy_lighttpd_pem_name}${_suffix}"
-  _issuer="${_pem}.issuer"
-  _ocsp="${_pem}.ocsp"
-  _reload="${Le_Deploy_lighttpd_reload}"
-
-  _info "Deploying PEM file"
-  # Create a temporary PEM file
-  _temppem="$(_mktemp)"
-  _debug _temppem "${_temppem}"
-  cat "${_ckey}" "${_ccert}" "${_cca}" >"${_temppem}"
-  _ret="$?"
-
-  # Check that we could create the temporary file
-  if [ "${_ret}" != "0" ]; then
-    _err "Error code ${_ret} returned during PEM file creation"
-    [ -f "${_temppem}" ] && rm -f "${_temppem}"
-    return ${_ret}
-  fi
-
-  # Move PEM file into place
-  _info "Moving new certificate into place"
-  _debug _pem "${_pem}"
-  cat "${_temppem}" >"${_pem}"
-  _ret=$?
-
-  # Clean up temp file
-  [ -f "${_temppem}" ] && rm -f "${_temppem}"
-
-  # Deal with any failure of moving PEM file into place
-  if [ "${_ret}" != "0" ]; then
-    _err "Error code ${_ret} returned while moving new certificate into place"
-    return ${_ret}
-  fi
-
-  # Update .issuer file if requested
-  if [ "${Le_Deploy_lighttpd_issuer}" = "yes" ]; then
-    _info "Updating .issuer file"
-    _debug _issuer "${_issuer}"
-    cat "${_cca}" >"${_issuer}"
-    _ret="$?"
-
-    if [ "${_ret}" != "0" ]; then
-      _err "Error code ${_ret} returned while copying issuer/CA certificate into place"
-      return ${_ret}
-    fi
-  else
-    [ -f "${_issuer}" ] && _err "Issuer file update not requested but .issuer file exists"
-  fi
-
-  # Update .ocsp file if certificate was requested with --ocsp/--ocsp-must-staple option
-  if [ -z "${Le_OCSP_Staple}" ]; then
-    Le_OCSP_Staple="0"
-  fi
-  if [ "${Le_OCSP_Staple}" = "1" ]; then
-    _info "Updating OCSP stapling info"
-    _debug _ocsp "${_ocsp}"
-    _info "Extracting OCSP URL"
-    _ocsp_url=$(${ACME_OPENSSL_BIN:-openssl} x509 -noout -ocsp_uri -in "${_pem}")
-    _debug _ocsp_url "${_ocsp_url}"
-
-    # Only process OCSP if URL was present
-    if [ "${_ocsp_url}" != "" ]; then
-      # Extract the hostname from the OCSP URL
-      _info "Extracting OCSP URL"
-      _ocsp_host=$(echo "${_ocsp_url}" | cut -d/ -f3)
-      _debug _ocsp_host "${_ocsp_host}"
-
-      # Only process the certificate if we have a .issuer file
-      if [ -r "${_issuer}" ]; then
-        # Check if issuer cert is also a root CA cert
-        _subjectdn=$(${ACME_OPENSSL_BIN:-openssl} x509 -in "${_issuer}" -subject -noout | cut -d'/' -f2,3,4,5,6,7,8,9,10)
-        _debug _subjectdn "${_subjectdn}"
-        _issuerdn=$(${ACME_OPENSSL_BIN:-openssl} x509 -in "${_issuer}" -issuer -noout | cut -d'/' -f2,3,4,5,6,7,8,9,10)
-        _debug _issuerdn "${_issuerdn}"
-        _info "Requesting OCSP response"
-        # If the issuer is a CA cert then our command line has "-CAfile" added
-        if [ "${_subjectdn}" = "${_issuerdn}" ]; then
-          _cafile_argument="-CAfile \"${_issuer}\""
-        else
-          _cafile_argument=""
-        fi
-        _debug _cafile_argument "${_cafile_argument}"
-        # if OpenSSL/LibreSSL is v1.1 or above, the format for the -header option has changed
-        _openssl_version=$(${ACME_OPENSSL_BIN:-openssl} version | cut -d' ' -f2)
-        _debug _openssl_version "${_openssl_version}"
-        _openssl_major=$(echo "${_openssl_version}" | cut -d '.' -f1)
-        _openssl_minor=$(echo "${_openssl_version}" | cut -d '.' -f2)
-        if [ "${_openssl_major}" -eq "1" ] && [ "${_openssl_minor}" -ge "1" ] || [ "${_openssl_major}" -ge "2" ]; then
-          _header_sep="="
-        else
-          _header_sep=" "
-        fi
-        # Request the OCSP response from the issuer and store it
-        _openssl_ocsp_cmd="${ACME_OPENSSL_BIN:-openssl} ocsp \
-          -issuer \"${_issuer}\" \
-          -cert \"${_pem}\" \
-          -url \"${_ocsp_url}\" \
-          -header Host${_header_sep}\"${_ocsp_host}\" \
-          -respout \"${_ocsp}\" \
-          -verify_other \"${_issuer}\" \
-          ${_cafile_argument} \
-          | grep -q \"${_pem}: good\""
-        _debug _openssl_ocsp_cmd "${_openssl_ocsp_cmd}"
-        eval "${_openssl_ocsp_cmd}"
-        _ret=$?
-      else
-        # Non fatal: No issuer file was present so no OCSP stapling file created
-        _err "OCSP stapling in use but no .issuer file was present"
-      fi
-    else
-      # Non fatal: No OCSP url was found int the certificate
-      _err "OCSP update requested but no OCSP URL was found in certificate"
-    fi
-
-    # Non fatal: Check return code of openssl command
-    if [ "${_ret}" != "0" ]; then
-      _err "Updating OCSP stapling failed with return code ${_ret}"
-    fi
-  else
-    # An OCSP file was already present but certificate did not have OCSP extension
-    if [ -f "${_ocsp}" ]; then
-      _err "OCSP was not requested but .ocsp file exists."
-      # Could remove the file at this step, although Lighttpd just ignores it in this case
-      # rm -f "${_ocsp}" || _err "Problem removing stale .ocsp file"
-    fi
-  fi
-
-  # Reload Lighttpd
-  _debug _reload "${_reload}"
-  eval "${_reload}"
-  _ret=$?
-  if [ "${_ret}" != "0" ]; then
-    _err "Error code ${_ret} during reload"
-    return ${_ret}
-  else
-    _info "Reload successful"
-  fi
-
-  return 0
-}

deploy/mailcow.sh

@@ -20,23 +20,18 @@ mailcow_deploy() {
   _debug _cca "$_cca"
   _debug _cfullchain "$_cfullchain"
 
-  _getdeployconf DEPLOY_MAILCOW_PATH
-  _getdeployconf DEPLOY_MAILCOW_RELOAD
+  _mailcow_path="${DEPLOY_MAILCOW_PATH}"
 
-  _debug DEPLOY_MAILCOW_PATH "$DEPLOY_MAILCOW_PATH"
-  _debug DEPLOY_MAILCOW_RELOAD "$DEPLOY_MAILCOW_RELOAD"
-
-  if [ -z "$DEPLOY_MAILCOW_PATH" ]; then
+  if [ -z "$_mailcow_path" ]; then
     _err "Mailcow path is not found, please define DEPLOY_MAILCOW_PATH."
     return 1
   fi
 
-  _savedeployconf DEPLOY_MAILCOW_PATH "$DEPLOY_MAILCOW_PATH"
-  [ -n "$DEPLOY_MAILCOW_RELOAD" ] && _savedeployconf DEPLOY_MAILCOW_RELOAD "$DEPLOY_MAILCOW_RELOAD"
-
-  _ssl_path="$DEPLOY_MAILCOW_PATH"
-  if [ -f "$DEPLOY_MAILCOW_PATH/generate_config.sh" ]; then
-    _ssl_path="$DEPLOY_MAILCOW_PATH/data/assets/ssl/"
+  #Tests if _ssl_path is the mailcow root directory.
+  if [ -f "${_mailcow_path}/generate_config.sh" ]; then
+    _ssl_path="${_mailcow_path}/data/assets/ssl/"
+  else
+    _ssl_path="${_mailcow_path}"
   fi
 
   if [ ! -d "$_ssl_path" ]; then
@@ -44,20 +39,31 @@ mailcow_deploy() {
     return 1
   fi
 
+  # ECC or RSA
+  if [ -z "${Le_Keylength}" ]; then
+    Le_Keylength=""
+  fi
+  if _isEccKey "${Le_Keylength}"; then
+    _info "ECC key type detected"
+    _cert_name_prefix="ecdsa-"
+  else
+    _info "RSA key type detected"
+    _cert_name_prefix=""
+  fi
   _info "Copying key and cert"
-  _real_key="$_ssl_path/key.pem"
+  _real_key="$_ssl_path/${_cert_name_prefix}key.pem"
   if ! cat "$_ckey" >"$_real_key"; then
     _err "Error: write key file to: $_real_key"
     return 1
   fi
 
-  _real_fullchain="$_ssl_path/cert.pem"
+  _real_fullchain="$_ssl_path/${_cert_name_prefix}cert.pem"
   if ! cat "$_cfullchain" >"$_real_fullchain"; then
     _err "Error: write cert file to: $_real_fullchain"
     return 1
   fi
 
-  DEFAULT_MAILCOW_RELOAD="docker restart \$(docker ps --quiet --filter name=nginx-mailcow --filter name=dovecot-mailcow --filter name=postfix-mailcow)"
+  DEFAULT_MAILCOW_RELOAD="docker restart $(docker ps -qaf name=postfix-mailcow); docker restart $(docker ps -qaf name=nginx-mailcow); docker restart $(docker ps -qaf name=dovecot-mailcow)"
   _reload="${DEPLOY_MAILCOW_RELOAD:-$DEFAULT_MAILCOW_RELOAD}"
 
   _info "Run reload: $_reload"

deploy/openmediavault.sh

@@ -1,156 +0,0 @@
-#!/usr/bin/env sh
-
-# This deploy hook is tested on OpenMediaVault 5.x. It supports both local and remote deployment.
-# The way it works is that if a cert with the matching domain name is not found, it will firstly create a dummy cert to get its uuid, and then replace it with your cert.
-#
-# DEPLOY_OMV_WEBUI_ADMIN - This is OMV web gui admin account. Default value is admin. It's required as the user parameter (-u) for the omv-rpc command.
-# DEPLOY_OMV_HOST and DEPLOY_OMV_SSH_USER are optional. They are used for remote deployment through ssh (support public key authentication only). Per design, OMV web gui admin doesn't have ssh permission, so another account is needed for ssh.
-#
-# returns 0 means success, otherwise error.
-
-########  Public functions #####################
-
-#domain keyfile certfile cafile fullchain
-openmediavault_deploy() {
-  _cdomain="$1"
-  _ckey="$2"
-  _ccert="$3"
-  _cca="$4"
-  _cfullchain="$5"
-
-  _debug _cdomain "$_cdomain"
-  _debug _ckey "$_ckey"
-  _debug _ccert "$_ccert"
-  _debug _cca "$_cca"
-  _debug _cfullchain "$_cfullchain"
-
-  _getdeployconf DEPLOY_OMV_WEBUI_ADMIN
-
-  if [ -z "$DEPLOY_OMV_WEBUI_ADMIN" ]; then
-    DEPLOY_OMV_WEBUI_ADMIN="admin"
-  fi
-
-  _savedeployconf DEPLOY_OMV_WEBUI_ADMIN "$DEPLOY_OMV_WEBUI_ADMIN"
-
-  _getdeployconf DEPLOY_OMV_HOST
-  _getdeployconf DEPLOY_OMV_SSH_USER
-
-  if [ -n "$DEPLOY_OMV_HOST" ] && [ -n "$DEPLOY_OMV_SSH_USER" ]; then
-    _info "[OMV deploy-hook] Deploy certificate remotely through ssh."
-    _savedeployconf DEPLOY_OMV_HOST "$DEPLOY_OMV_HOST"
-    _savedeployconf DEPLOY_OMV_SSH_USER "$DEPLOY_OMV_SSH_USER"
-  else
-    _info "[OMV deploy-hook] Deploy certificate locally."
-  fi
-
-  if [ -n "$DEPLOY_OMV_HOST" ] && [ -n "$DEPLOY_OMV_SSH_USER" ]; then
-
-    _command="omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'CertificateMgmt' 'getList' '{\"start\": 0, \"limit\": -1}' | jq -r '.data[] | select(.name==\"/CN='$_cdomain'\") | .uuid'"
-    # shellcheck disable=SC2029
-    _uuid=$(ssh "$DEPLOY_OMV_SSH_USER@$DEPLOY_OMV_HOST" "$_command")
-    _debug _command "$_command"
-
-    if [ -z "$_uuid" ]; then
-      _info "[OMV deploy-hook] Domain $_cdomain has no certificate in openmediavault, creating it!"
-      _command="omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'CertificateMgmt' 'create' '{\"cn\": \"test.example.com\", \"size\": 4096, \"days\": 3650, \"c\": \"\", \"st\": \"\", \"l\": \"\", \"o\": \"\", \"ou\": \"\", \"email\": \"\"}' | jq -r '.uuid'"
-      # shellcheck disable=SC2029
-      _uuid=$(ssh "$DEPLOY_OMV_SSH_USER@$DEPLOY_OMV_HOST" "$_command")
-      _debug _command "$_command"
-
-      if [ -z "$_uuid" ]; then
-        _err "[OMV deploy-hook] An error occured while creating the certificate"
-        return 1
-      fi
-    fi
-
-    _info "[OMV deploy-hook] Domain $_cdomain has uuid: $_uuid"
-    _fullchain=$(jq <"$_cfullchain" -aRs .)
-    _key=$(jq <"$_ckey" -aRs .)
-
-    _debug _fullchain "$_fullchain"
-    _debug _key "$_key"
-
-    _info "[OMV deploy-hook] Updating key and certificate in openmediavault"
-    _command="omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'CertificateMgmt' 'set' '{\"uuid\":\"$_uuid\", \"certificate\":$_fullchain, \"privatekey\":$_key, \"comment\":\"acme.sh deployed $(date)\"}'"
-    # shellcheck disable=SC2029
-    _result=$(ssh "$DEPLOY_OMV_SSH_USER@$DEPLOY_OMV_HOST" "$_command")
-
-    _debug _command "$_command"
-    _debug _result "$_result"
-
-    _command="omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'WebGui' 'setSettings' \$(omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'WebGui' 'getSettings' | jq -c '.sslcertificateref=\"$_uuid\"')"
-    # shellcheck disable=SC2029
-    _result=$(ssh "$DEPLOY_OMV_SSH_USER@$DEPLOY_OMV_HOST" "$_command")
-
-    _debug _command "$_command"
-    _debug _result "$_result"
-
-    _info "[OMV deploy-hook] Asking openmediavault to apply changes... (this could take some time, hang in there)"
-    _command="omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'Config' 'applyChanges' '{\"modules\":[], \"force\": false}'"
-    # shellcheck disable=SC2029
-    _result=$(ssh "$DEPLOY_OMV_SSH_USER@$DEPLOY_OMV_HOST" "$_command")
-
-    _debug _command "$_command"
-    _debug _result "$_result"
-
-    _info "[OMV deploy-hook] Asking nginx to reload"
-    _command="nginx -s reload"
-    # shellcheck disable=SC2029
-    _result=$(ssh "$DEPLOY_OMV_SSH_USER@$DEPLOY_OMV_HOST" "$_command")
-
-    _debug _command "$_command"
-    _debug _result "$_result"
-
-  else
-
-    # shellcheck disable=SC2086
-    _uuid=$(omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'CertificateMgmt' 'getList' '{"start": 0, "limit": -1}' | jq -r '.data[] | select(.name=="/CN='$_cdomain'") | .uuid')
-    if [ -z "$_uuid" ]; then
-      _info "[OMV deploy-hook] Domain $_cdomain has no certificate in openmediavault, creating it!"
-      # shellcheck disable=SC2086
-      _uuid=$(omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'CertificateMgmt' 'create' '{"cn": "test.example.com", "size": 4096, "days": 3650, "c": "", "st": "", "l": "", "o": "", "ou": "", "email": ""}' | jq -r '.uuid')
-
-      if [ -z "$_uuid" ]; then
-        _err "[OMB deploy-hook] An error occured while creating the certificate"
-        return 1
-      fi
-    fi
-
-    _info "[OMV deploy-hook] Domain $_cdomain has uuid: $_uuid"
-    _fullchain=$(jq <"$_cfullchain" -aRs .)
-    _key=$(jq <"$_ckey" -aRs .)
-
-    _debug _fullchain "$_fullchain"
-    _debug _key "$_key"
-
-    _info "[OMV deploy-hook] Updating key and certificate in openmediavault"
-    _command="omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'CertificateMgmt' 'set' '{\"uuid\":\"$_uuid\", \"certificate\":$_fullchain, \"privatekey\":$_key, \"comment\":\"acme.sh deployed $(date)\"}'"
-    _result=$(eval "$_command")
-
-    _debug _command "$_command"
-    _debug _result "$_result"
-
-    _command="omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'WebGui' 'setSettings' \$(omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'WebGui' 'getSettings' | jq -c '.sslcertificateref=\"$_uuid\"')"
-    _result=$(eval "$_command")
-
-    _debug _command "$_command"
-    _debug _result "$_result"
-
-    _info "[OMV deploy-hook] Asking openmediavault to apply changes... (this could take some time, hang in there)"
-    _command="omv-rpc -u $DEPLOY_OMV_WEBUI_ADMIN 'Config' 'applyChanges' '{\"modules\":[], \"force\": false}'"
-    _result=$(eval "$_command")
-
-    _debug _command "$_command"
-    _debug _result "$_result"
-
-    _info "[OMV deploy-hook] Asking nginx to reload"
-    _command="nginx -s reload"
-    _result=$(eval "$_command")
-
-    _debug _command "$_command"
-    _debug _result "$_result"
-
-  fi
-
-  return 0
-}

deploy/panos.sh

@@ -7,18 +7,11 @@
 #
 # Firewall admin with superuser and IP address is required.
 #
-# REQURED:
-#     export PANOS_HOST=""
-#     export PANOS_USER=""    #User *MUST* have Commit and Import Permissions in XML API for Admin Role
-#     export PANOS_PASS=""
-#
-# OPTIONAL
-#    export PANOS_TEMPLATE="" #Template Name of panorama managed devices
-#
-# The script will automatically generate a new API key if
-# no key is found, or if a saved key has expired or is invalid.
+# export PANOS_USER=""  # required
+# export PANOS_PASS=""  # required
+# export PANOS_HOST=""  # required
 
-# This function is to parse the XML response from the firewall
+# This function is to parse the XML
 parse_response() {
   type=$2
   if [ "$type" = 'keygen' ]; then
@@ -30,46 +23,25 @@ parse_response() {
       message="PAN-OS Key could not be set."
     fi
   else
-    status=$(echo "$1" | tr -d '\n' | sed 's/^.*"\([a-z]*\)".*/\1/g')
-    message=$(echo "$1" | tr -d '\n' | sed 's/.*\(<result>\|<msg>\|<line>\)\([^<]*\).*/\2/g')
-    _debug "Firewall message:  $message"
-    if [ "$type" = 'keytest' ] && [ "$status" != "success" ]; then
-      _debug "****  API Key has EXPIRED or is INVALID ****"
-      unset _panos_key
-    fi
+    status=$(echo "$1" | sed 's/^.*"\([a-z]*\)".*/\1/g')
+    message=$(echo "$1" | sed 's/^.*<result>\(.*\)<\/result.*/\1/g')
   fi
   return 0
 }
 
-#This function is used to deploy to the firewall
 deployer() {
   content=""
-  type=$1 # Types are keytest, keygen, cert, key, commit
+  type=$1 # Types are keygen, cert, key, commit
+  _debug "**** Deploying $type *****"
   panos_url="https://$_panos_host/api/"
-
-  #Test API Key by performing a lookup
-  if [ "$type" = 'keytest' ]; then
-    _debug "**** Testing saved API Key ****"
-    _H1="Content-Type: application/x-www-form-urlencoded"
-    # Get Version Info to test key
-    content="type=version&key=$_panos_key"
-    ## Exclude all scopes for the empty commit
-    #_exclude_scope="<policy-and-objects>exclude</policy-and-objects><device-and-network>exclude</device-and-network><shared-object>exclude</shared-object>"
-    #content="type=commit&action=partial&key=$_panos_key&cmd=<commit><partial>$_exclude_scope<admin><member>acmekeytest</member></admin></partial></commit>"
-  fi
-
-  # Generate API Key
   if [ "$type" = 'keygen' ]; then
-    _debug "**** Generating new API Key ****"
     _H1="Content-Type: application/x-www-form-urlencoded"
     content="type=keygen&user=$_panos_user&password=$_panos_pass"
     # content="$content${nl}--$delim${nl}Content-Disposition: form-data; type=\"keygen\"; user=\"$_panos_user\"; password=\"$_panos_pass\"${nl}Content-Type: application/octet-stream${nl}${nl}"
   fi
 
-  # Deploy Cert or Key
   if [ "$type" = 'cert' ] || [ "$type" = 'key' ]; then
-    _debug "**** Deploying $type ****"
-    #Generate DELIM
+    #Generate DEIM
     delim="-----MultipartDelimiter$(date "+%s%N")"
     nl="\015\012"
     #Set Header
@@ -81,9 +53,6 @@ deployer() {
       content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"key\"\r\n\r\n$_panos_key"
       content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"format\"\r\n\r\npem"
       content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"file\"; filename=\"$(basename "$_cfullchain")\"${nl}Content-Type: application/octet-stream${nl}${nl}$(cat "$_cfullchain")"
-      if [ "$_panos_template" ]; then
-        content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"target-tpl\"\r\n\r\n$_panos_template"
-      fi
     fi
     if [ "$type" = 'key' ]; then
       panos_url="${panos_url}?type=import"
@@ -92,10 +61,7 @@ deployer() {
       content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"key\"\r\n\r\n$_panos_key"
       content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"format\"\r\n\r\npem"
       content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"passphrase\"\r\n\r\n123456"
-      content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"file\"; filename=\"$(basename "$_cdomain.key")\"${nl}Content-Type: application/octet-stream${nl}${nl}$(cat "$_ckey")"
-      if [ "$_panos_template" ]; then
-        content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"target-tpl\"\r\n\r\n$_panos_template"
-      fi
+      content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"file\"; filename=\"$(basename "$_ckey")\"${nl}Content-Type: application/octet-stream${nl}${nl}$(cat "$_ckey")"
     fi
     #Close multipart
     content="$content${nl}--$delim--${nl}${nl}"
@@ -103,25 +69,16 @@ deployer() {
     content=$(printf %b "$content")
   fi
 
-  # Commit changes
   if [ "$type" = 'commit' ]; then
-    _debug "**** Committing changes ****"
     export _H1="Content-Type: application/x-www-form-urlencoded"
-    #Check for force commit - will commit ALL uncommited changes to the firewall. Use with caution!
-    if [ "$FORCE" ]; then
-      _debug "Force switch detected.  Committing ALL changes to the firewall."
-      cmd=$(printf "%s" "<commit><partial><force><admin><member>$_panos_user</member></admin></force></partial></commit>" | _url_encode)
-    else
-      _exclude_scope="<policy-and-objects>exclude</policy-and-objects><device-and-network>exclude</device-and-network>"
-      cmd=$(printf "%s" "<commit><partial>$_exclude_scope<admin><member>$_panos_user</member></admin></partial></commit>" | _url_encode)
-    fi
-    content="type=commit&action=partial&key=$_panos_key&cmd=$cmd"
+    cmd=$(printf "%s" "<commit><partial><$_panos_user></$_panos_user></partial></commit>" | _url_encode)
+    content="type=commit&key=$_panos_key&cmd=$cmd"
   fi
-
   response=$(_post "$content" "$panos_url" "" "POST")
   parse_response "$response" "$type"
   # Saving response to variables
   response_status=$status
+  #DEBUG
   _debug response_status "$response_status"
   if [ "$response_status" = "success" ]; then
     _debug "Successfully deployed $type"
@@ -135,95 +92,43 @@ deployer() {
 
 # This is the main function that will call the other functions to deploy everything.
 panos_deploy() {
-  _cdomain=$(echo "$1" | sed 's/*/WILDCARD_/g') #Wildcard Safe Filename
+  _cdomain="$1"
   _ckey="$2"
   _cfullchain="$5"
-
-  # VALID FILE CHECK
-  if [ ! -f "$_ckey" ] || [ ! -f "$_cfullchain" ]; then
-    _err "Unable to find a valid key and/or cert.  If this is an ECDSA/ECC cert, use the --ecc flag when deploying."
-    return 1
-  fi
-
-  # PANOS_HOST
-  if [ "$PANOS_HOST" ]; then
-    _debug "Detected ENV variable PANOS_HOST. Saving to file."
-    _savedeployconf PANOS_HOST "$PANOS_HOST" 1
-  else
-    _debug "Attempting to load variable PANOS_HOST from file."
-    _getdeployconf PANOS_HOST
-  fi
-
-  # PANOS USER
-  if [ "$PANOS_USER" ]; then
-    _debug "Detected ENV variable PANOS_USER. Saving to file."
-    _savedeployconf PANOS_USER "$PANOS_USER" 1
-  else
-    _debug "Attempting to load variable PANOS_USER from file."
+  # PANOS ENV VAR check
+  if [ -z "$PANOS_USER" ] || [ -z "$PANOS_PASS" ] || [ -z "$PANOS_HOST" ]; then
+    _debug "No ENV variables found lets check for saved variables"
     _getdeployconf PANOS_USER
-  fi
-
-  # PANOS_PASS
-  if [ "$PANOS_PASS" ]; then
-    _debug "Detected ENV variable PANOS_PASS. Saving to file."
-    _savedeployconf PANOS_PASS "$PANOS_PASS" 1
-  else
-    _debug "Attempting to load variable PANOS_PASS from file."
     _getdeployconf PANOS_PASS
-  fi
-
-  # PANOS_KEY
-  _getdeployconf PANOS_KEY
-  if [ "$PANOS_KEY" ]; then
-    _debug "Detected saved key."
-    _panos_key=$PANOS_KEY
-  else
-    _debug "No key detected"
-    unset _panos_key
-  fi
-
-  # PANOS_TEMPLATE
-  if [ "$PANOS_TEMPLATE" ]; then
-    _debug "Detected ENV variable PANOS_TEMPLATE. Saving to file."
-    _savedeployconf PANOS_TEMPLATE "$PANOS_TEMPLATE" 1
-  else
-    _debug "Attempting to load variable PANOS_TEMPLATE from file."
-    _getdeployconf PANOS_TEMPLATE
-  fi
-
-  #Store variables
-  _panos_host=$PANOS_HOST
-  _panos_user=$PANOS_USER
-  _panos_pass=$PANOS_PASS
-  _panos_template=$PANOS_TEMPLATE
-
-  #Test API Key if found.  If the key is invalid, the variable _panos_key will be unset.
-  if [ "$_panos_host" ] && [ "$_panos_key" ]; then
-    _debug "**** Testing API KEY ****"
-    deployer keytest
-  fi
-
-  # Check for valid variables
-  if [ -z "$_panos_host" ]; then
-    _err "No host found. If this is your first time deploying, please set PANOS_HOST in ENV variables. You can delete it after you have successfully deployed the certs."
-    return 1
-  elif [ -z "$_panos_user" ]; then
-    _err "No user found. If this is your first time deploying, please set PANOS_USER in ENV variables. You can delete it after you have successfully deployed the certs."
-    return 1
-  elif [ -z "$_panos_pass" ]; then
-    _err "No password found. If this is your first time deploying, please set PANOS_PASS in ENV variables. You can delete it after you have successfully deployed the certs."
-    return 1
-  else
-    # Generate a new API key if no valid API key is found
-    if [ -z "$_panos_key" ]; then
-      _debug "**** Generating new PANOS API KEY ****"
-      deployer keygen
-      _savedeployconf PANOS_KEY "$_panos_key" 1
+    _getdeployconf PANOS_HOST
+    _panos_user=$PANOS_USER
+    _panos_pass=$PANOS_PASS
+    _panos_host=$PANOS_HOST
+    if [ -z "$_panos_user" ] && [ -z "$_panos_pass" ] && [ -z "$_panos_host" ]; then
+      _err "No host, user and pass found.. If this is the first time deploying please set PANOS_HOST, PANOS_USER and PANOS_PASS in environment variables. Delete them after you have succesfully deployed certs."
+      return 1
+    else
+      _debug "Using saved env variables."
     fi
-
-    # Confirm that a valid key was generated
+  else
+    _debug "Detected ENV variables to be saved to the deploy conf."
+    # Encrypt and save user
+    _savedeployconf PANOS_USER "$PANOS_USER" 1
+    _savedeployconf PANOS_PASS "$PANOS_PASS" 1
+    _savedeployconf PANOS_HOST "$PANOS_HOST" 1
+    _panos_user="$PANOS_USER"
+    _panos_pass="$PANOS_PASS"
+    _panos_host="$PANOS_HOST"
+  fi
+  _debug "Let's use username and pass to generate token."
+  if [ -z "$_panos_user" ] || [ -z "$_panos_pass" ] || [ -z "$_panos_host" ]; then
+    _err "Please pass username and password and host as env variables PANOS_USER, PANOS_PASS and PANOS_HOST"
+    return 1
+  else
+    _debug "Getting PANOS KEY"
+    deployer keygen
     if [ -z "$_panos_key" ]; then
-      _err "Unable to generate an API key.  The user and pass may be invalid or not authorized to generate a new key.  Please check the PANOS_USER and PANOS_PASS credentials and try again"
+      _err "Missing apikey."
       return 1
     else
       deployer cert

deploy/peplink.sh

@@ -1,123 +0,0 @@
-#!/usr/bin/env sh
-
-# Script to deploy cert to Peplink Routers
-#
-# The following environment variables must be set:
-#
-# PEPLINK_Hostname - Peplink hostname
-# PEPLINK_Username - Peplink username to login
-# PEPLINK_Password - Peplink password to login
-#
-# The following environmental variables may be set if you don't like their
-# default values:
-#
-# PEPLINK_Certtype - Certificate type to target for replacement
-#                    defaults to "webadmin", can be one of:
-#                      * "chub" (ContentHub)
-#                      * "openvpn" (OpenVPN CA)
-#                      * "portal" (Captive Portal SSL)
-#                      * "webadmin" (Web Admin SSL)
-#                      * "webproxy" (Proxy Root CA)
-#                      * "wwan_ca" (Wi-Fi WAN CA)
-#                      * "wwan_client" (Wi-Fi WAN Client)
-# PEPLINK_Scheme   - defaults to "https"
-# PEPLINK_Port     - defaults to "443"
-#
-#returns 0 means success, otherwise error.
-
-########  Public functions #####################
-
-_peplink_get_cookie_data() {
-  grep -i "\W$1=" | grep -i "^Set-Cookie:" | _tail_n 1 | _egrep_o "$1=[^;]*;" | tr -d ';'
-}
-
-#domain keyfile certfile cafile fullchain
-peplink_deploy() {
-
-  _cdomain="$1"
-  _ckey="$2"
-  _cfullchain="$5"
-
-  _debug _cdomain "$_cdomain"
-  _debug _cfullchain "$_cfullchain"
-  _debug _ckey "$_ckey"
-
-  # Get Hostname, Username and Password, but don't save until we successfully authenticate
-  _getdeployconf PEPLINK_Hostname
-  _getdeployconf PEPLINK_Username
-  _getdeployconf PEPLINK_Password
-  if [ -z "${PEPLINK_Hostname:-}" ] || [ -z "${PEPLINK_Username:-}" ] || [ -z "${PEPLINK_Password:-}" ]; then
-    _err "PEPLINK_Hostname & PEPLINK_Username & PEPLINK_Password must be set"
-    return 1
-  fi
-  _debug2 PEPLINK_Hostname "$PEPLINK_Hostname"
-  _debug2 PEPLINK_Username "$PEPLINK_Username"
-  _secure_debug2 PEPLINK_Password "$PEPLINK_Password"
-
-  # Optional certificate type, scheme, and port for Peplink
-  _getdeployconf PEPLINK_Certtype
-  _getdeployconf PEPLINK_Scheme
-  _getdeployconf PEPLINK_Port
-
-  # Don't save the certificate type until we verify it exists and is supported
-  _savedeployconf PEPLINK_Scheme "$PEPLINK_Scheme"
-  _savedeployconf PEPLINK_Port "$PEPLINK_Port"
-
-  # Default vaules for certificate type, scheme, and port
-  [ -n "${PEPLINK_Certtype}" ] || PEPLINK_Certtype="webadmin"
-  [ -n "${PEPLINK_Scheme}" ] || PEPLINK_Scheme="https"
-  [ -n "${PEPLINK_Port}" ] || PEPLINK_Port="443"
-
-  _debug2 PEPLINK_Certtype "$PEPLINK_Certtype"
-  _debug2 PEPLINK_Scheme "$PEPLINK_Scheme"
-  _debug2 PEPLINK_Port "$PEPLINK_Port"
-
-  _base_url="$PEPLINK_Scheme://$PEPLINK_Hostname:$PEPLINK_Port"
-  _debug _base_url "$_base_url"
-
-  # Login, get the auth token from the cookie
-  _info "Logging into $PEPLINK_Hostname:$PEPLINK_Port"
-  encoded_username="$(printf "%s" "$PEPLINK_Username" | _url_encode)"
-  encoded_password="$(printf "%s" "$PEPLINK_Password" | _url_encode)"
-  response=$(_post "func=login&username=$encoded_username&password=$encoded_password" "$_base_url/cgi-bin/MANGA/api.cgi")
-  auth_token=$(_peplink_get_cookie_data "bauth" <"$HTTP_HEADER")
-  _debug3 response "$response"
-  _debug auth_token "$auth_token"
-
-  if [ -z "$auth_token" ]; then
-    _err "Unable to authenticate to $PEPLINK_Hostname:$PEPLINK_Port using $PEPLINK_Scheme."
-    _err "Check your username and password."
-    return 1
-  fi
-
-  _H1="Cookie: $auth_token"
-  export _H1
-  _debug2 H1 "${_H1}"
-
-  # Now that we know the hostnameusername and password are good, save them
-  _savedeployconf PEPLINK_Hostname "$PEPLINK_Hostname"
-  _savedeployconf PEPLINK_Username "$PEPLINK_Username"
-  _savedeployconf PEPLINK_Password "$PEPLINK_Password"
-
-  _info "Generate form POST request"
-
-  encoded_key="$(_url_encode <"$_ckey")"
-  encoded_fullchain="$(_url_encode <"$_cfullchain")"
-  body="cert_type=$PEPLINK_Certtype&cert_uid=&section=CERT_modify&key_pem=$encoded_key&key_pem_passphrase=&key_pem_passphrase_confirm=&cert_pem=$encoded_fullchain"
-  _debug3 body "$body"
-
-  _info "Upload $PEPLINK_Certtype certificate to the Peplink"
-
-  response=$(_post "$body" "$_base_url/cgi-bin/MANGA/admin.cgi")
-  _debug3 response "$response"
-
-  if echo "$response" | grep 'Success' >/dev/null; then
-    # We've verified this certificate type is valid, so save it
-    _savedeployconf PEPLINK_Certtype "$PEPLINK_Certtype"
-    _info "Certificate was updated"
-    return 0
-  else
-    _err "Unable to update certificate, error code $response"
-    return 1
-  fi
-}

deploy/proxmoxve.sh

@@ -1,132 +0,0 @@
-#!/usr/bin/env sh
-
-# Deploy certificates to a proxmox virtual environment node using the API.
-#
-# Environment variables that can be set are:
-# `DEPLOY_PROXMOXVE_SERVER`: The hostname of the proxmox ve node. Defaults to
-#                            _cdomain.
-# `DEPLOY_PROXMOXVE_SERVER_PORT`: The port number the management interface is on.
-#                                 Defaults to 8006.
-# `DEPLOY_PROXMOXVE_NODE_NAME`: The name of the node we'll be connecting to.
-#                               Defaults to the host portion of the server
-#                               domain name.
-# `DEPLOY_PROXMOXVE_USER`: The user we'll connect as. Defaults to root.
-# `DEPLOY_PROXMOXVE_USER_REALM`: The authentication realm the user authenticates
-#                                with. Defaults to pam.
-# `DEPLOY_PROXMOXVE_API_TOKEN_NAME`: The name of the API token created for the
-#                                    user account. Defaults to acme.
-# `DEPLOY_PROXMOXVE_API_TOKEN_KEY`: The API token. Required.
-
-proxmoxve_deploy() {
-  _cdomain="$1"
-  _ckey="$2"
-  _ccert="$3"
-  _cca="$4"
-  _cfullchain="$5"
-
-  _debug _cdomain "$_cdomain"
-  _debug2 _ckey "$_ckey"
-  _debug _ccert "$_ccert"
-  _debug _cca "$_cca"
-  _debug _cfullchain "$_cfullchain"
-
-  # "Sane" defaults.
-  _getdeployconf DEPLOY_PROXMOXVE_SERVER
-  if [ -z "$DEPLOY_PROXMOXVE_SERVER" ]; then
-    _target_hostname="$_cdomain"
-  else
-    _target_hostname="$DEPLOY_PROXMOXVE_SERVER"
-    _savedeployconf DEPLOY_PROXMOXVE_SERVER "$DEPLOY_PROXMOXVE_SERVER"
-  fi
-  _debug2 DEPLOY_PROXMOXVE_SERVER "$_target_hostname"
-
-  _getdeployconf DEPLOY_PROXMOXVE_SERVER_PORT
-  if [ -z "$DEPLOY_PROXMOXVE_SERVER_PORT" ]; then
-    _target_port="8006"
-  else
-    _target_port="$DEPLOY_PROXMOXVE_SERVER_PORT"
-    _savedeployconf DEPLOY_PROXMOXVE_SERVER_PORT "$DEPLOY_PROXMOXVE_SERVER_PORT"
-  fi
-  _debug2 DEPLOY_PROXMOXVE_SERVER_PORT "$_target_port"
-
-  _getdeployconf DEPLOY_PROXMOXVE_NODE_NAME
-  if [ -z "$DEPLOY_PROXMOXVE_NODE_NAME" ]; then
-    _node_name=$(echo "$_target_hostname" | cut -d. -f1)
-  else
-    _node_name="$DEPLOY_PROXMOXVE_NODE_NAME"
-    _savedeployconf DEPLOY_PROXMOXVE_NODE_NAME "$DEPLOY_PROXMOXVE_NODE_NAME"
-  fi
-  _debug2 DEPLOY_PROXMOXVE_NODE_NAME "$_node_name"
-
-  # Complete URL.
-  _target_url="https://${_target_hostname}:${_target_port}/api2/json/nodes/${_node_name}/certificates/custom"
-  _debug TARGET_URL "$_target_url"
-
-  # More "sane" defaults.
-  _getdeployconf DEPLOY_PROXMOXVE_USER
-  if [ -z "$DEPLOY_PROXMOXVE_USER" ]; then
-    _proxmoxve_user="root"
-  else
-    _proxmoxve_user="$DEPLOY_PROXMOXVE_USER"
-    _savedeployconf DEPLOY_PROXMOXVE_USER "$DEPLOY_PROXMOXVE_USER"
-  fi
-  _debug2 DEPLOY_PROXMOXVE_USER "$_proxmoxve_user"
-
-  _getdeployconf DEPLOY_PROXMOXVE_USER_REALM
-  if [ -z "$DEPLOY_PROXMOXVE_USER_REALM" ]; then
-    _proxmoxve_user_realm="pam"
-  else
-    _proxmoxve_user_realm="$DEPLOY_PROXMOXVE_USER_REALM"
-    _savedeployconf DEPLOY_PROXMOXVE_USER_REALM "$DEPLOY_PROXMOXVE_USER_REALM"
-  fi
-  _debug2 DEPLOY_PROXMOXVE_USER_REALM "$_proxmoxve_user_realm"
-
-  _getdeployconf DEPLOY_PROXMOXVE_API_TOKEN_NAME
-  if [ -z "$DEPLOY_PROXMOXVE_API_TOKEN_NAME" ]; then
-    _proxmoxve_api_token_name="acme"
-  else
-    _proxmoxve_api_token_name="$DEPLOY_PROXMOXVE_API_TOKEN_NAME"
-    _savedeployconf DEPLOY_PROXMOXVE_API_TOKEN_NAME "$DEPLOY_PROXMOXVE_API_TOKEN_NAME"
-  fi
-  _debug2 DEPLOY_PROXMOXVE_API_TOKEN_NAME "$_proxmoxve_api_token_name"
-
-  # This is required.
-  _getdeployconf DEPLOY_PROXMOXVE_API_TOKEN_KEY
-  if [ -z "$DEPLOY_PROXMOXVE_API_TOKEN_KEY" ]; then
-    _err "API key not provided."
-    return 1
-  else
-    _proxmoxve_api_token_key="$DEPLOY_PROXMOXVE_API_TOKEN_KEY"
-    _savedeployconf DEPLOY_PROXMOXVE_API_TOKEN_KEY "$DEPLOY_PROXMOXVE_API_TOKEN_KEY"
-  fi
-  _debug2 DEPLOY_PROXMOXVE_API_TOKEN_KEY "$_proxmoxve_api_token_key"
-
-  # PVE API Token header value. Used in "Authorization: PVEAPIToken".
-  _proxmoxve_header_api_token="${_proxmoxve_user}@${_proxmoxve_user_realm}!${_proxmoxve_api_token_name}=${_proxmoxve_api_token_key}"
-  _debug2 "Auth Header" "$_proxmoxve_header_api_token"
-
-  # Ugly. I hate putting heredocs inside functions because heredocs don't
-  # account for whitespace correctly but it _does_ work and is several times
-  # cleaner than anything else I had here.
-  #
-  # This dumps the json payload to a variable that should be passable to the
-  # _psot function.
-  _json_payload=$(
-    cat <<HEREDOC
-{
-  "certificates": "$(tr '\n' ':' <"$_cfullchain" | sed 's/:/\\n/g')",
-  "key": "$(tr '\n' ':' <"$_ckey" | sed 's/:/\\n/g')",
-  "node":"$_node_name",
-  "restart":"1",
-  "force":"1"
-}
-HEREDOC
-  )
-  _debug2 Payload "$_json_payload"
-
-  _info "Push certificates to server"
-  export HTTPS_INSECURE=1
-  export _H1="Authorization: PVEAPIToken=${_proxmoxve_header_api_token}"
-  _post "$_json_payload" "$_target_url" "" POST "application/json"
-
-}

deploy/qiniu.sh

@@ -53,7 +53,7 @@ qiniu_deploy() {
   sslcert_access_token="$(_make_access_token "$sslcert_path")"
   _debug sslcert_access_token "$sslcert_access_token"
   export _H1="Authorization: QBox $sslcert_access_token"
-  sslcert_response=$(_post "$sslcerl_body" "$QINIU_API_BASE$sslcert_path" 0 "POST" "application/json" | _dbase64)
+  sslcert_response=$(_post "$sslcerl_body" "$QINIU_API_BASE$sslcert_path" 0 "POST" "application/json" | _dbase64 "multiline")
 
   if ! _contains "$sslcert_response" "certID"; then
     _err "Error in creating certificate:"
@@ -75,7 +75,7 @@ qiniu_deploy() {
     update_access_token="$(_make_access_token "$update_path")"
     _debug update_access_token "$update_access_token"
     export _H1="Authorization: QBox $update_access_token"
-    update_response=$(_post "$update_body" "$QINIU_API_BASE$update_path" 0 "PUT" "application/json" | _dbase64)
+    update_response=$(_post "$update_body" "$QINIU_API_BASE$update_path" 0 "PUT" "application/json" | _dbase64 "multiline")
 
     if _contains "$update_response" "error"; then
       _err "Error in updating domain $domain httpsconf:"

deploy/routeros.sh

@@ -23,7 +23,6 @@
 # ```sh
 # export ROUTER_OS_USERNAME=certuser
 # export ROUTER_OS_HOST=router.example.com
-# export ROUTER_OS_PORT=22
 #
 # acme.sh --deploy -d ftp.example.com --deploy-hook routeros
 # ```
@@ -49,16 +48,6 @@
 # One optional thing to do as well is to create a script that updates
 # all the required services and run that script in a single command.
 #
-# To adopt parameters to `scp` and/or `ssh` set the optional
-# `ROUTER_OS_SSH_CMD` and `ROUTER_OS_SCP_CMD` variables accordingly,
-# see ssh(1) and scp(1) for parameters to those commands.
-#
-# Example:
-# ```ssh
-# export ROUTER_OS_SSH_CMD="ssh -i /acme.sh/.ssh/router.example.com -o UserKnownHostsFile=/acme.sh/.ssh/known_hosts"
-# export ROUTER_OS_SCP_CMD="scp -i /acme.sh/.ssh/router.example.com -o UserKnownHostsFile=/acme.sh/.ssh/known_hosts"
-# ````
-#
 # returns 0 means success, otherwise error.
 
 ########  Public functions #####################
@@ -70,7 +59,6 @@ routeros_deploy() {
   _ccert="$3"
   _cca="$4"
   _cfullchain="$5"
-  _err_code=0
 
   _debug _cdomain "$_cdomain"
   _debug _ckey "$_ckey"
@@ -78,127 +66,46 @@ routeros_deploy() {
   _debug _cca "$_cca"
   _debug _cfullchain "$_cfullchain"
 
-  _getdeployconf ROUTER_OS_HOST
-
   if [ -z "$ROUTER_OS_HOST" ]; then
     _debug "Using _cdomain as ROUTER_OS_HOST, please set if not correct."
     ROUTER_OS_HOST="$_cdomain"
   fi
 
-  _getdeployconf ROUTER_OS_USERNAME
-
   if [ -z "$ROUTER_OS_USERNAME" ]; then
     _err "Need to set the env variable ROUTER_OS_USERNAME"
     return 1
   fi
 
-  _getdeployconf ROUTER_OS_PORT
-
-  if [ -z "$ROUTER_OS_PORT" ]; then
-    _debug "Using default port 22 as ROUTER_OS_PORT, please set if not correct."
-    ROUTER_OS_PORT=22
-  fi
-
-  _getdeployconf ROUTER_OS_SSH_CMD
-
-  if [ -z "$ROUTER_OS_SSH_CMD" ]; then
-    _debug "Use default ssh setup."
-    ROUTER_OS_SSH_CMD="ssh -p $ROUTER_OS_PORT"
-  fi
-
-  _getdeployconf ROUTER_OS_SCP_CMD
-
-  if [ -z "$ROUTER_OS_SCP_CMD" ]; then
-    _debug "USe default scp setup."
-    ROUTER_OS_SCP_CMD="scp -P $ROUTER_OS_PORT"
-  fi
-
-  _getdeployconf ROUTER_OS_ADDITIONAL_SERVICES
-
   if [ -z "$ROUTER_OS_ADDITIONAL_SERVICES" ]; then
     _debug "Not enabling additional services"
     ROUTER_OS_ADDITIONAL_SERVICES=""
   fi
 
-  _savedeployconf ROUTER_OS_HOST "$ROUTER_OS_HOST"
-  _savedeployconf ROUTER_OS_USERNAME "$ROUTER_OS_USERNAME"
-  _savedeployconf ROUTER_OS_PORT "$ROUTER_OS_PORT"
-  _savedeployconf ROUTER_OS_SSH_CMD "$ROUTER_OS_SSH_CMD"
-  _savedeployconf ROUTER_OS_SCP_CMD "$ROUTER_OS_SCP_CMD"
-  _savedeployconf ROUTER_OS_ADDITIONAL_SERVICES "$ROUTER_OS_ADDITIONAL_SERVICES"
-
-  # push key to routeros
-  if ! _scp_certificate "$_ckey" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.key"; then
-    return $_err_code
-  fi
-
-  # push certificate chain to routeros
-  if ! _scp_certificate "$_cfullchain" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.cer"; then
-    return $_err_code
-  fi
-
-  DEPLOY_SCRIPT_CMD=":do {/system script remove \"LECertDeploy-$_cdomain\" } on-error={ }; \
-/system script add name=\"LECertDeploy-$_cdomain\" owner=$ROUTER_OS_USERNAME \
-comment=\"generated by routeros deploy script in acme.sh\" \
-source=\"/certificate remove [ find name=$_cdomain.cer_0 ];\
+  _info "Trying to push key '$_ckey' to router"
+  scp "$_ckey" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.key"
+  _info "Trying to push cert '$_cfullchain' to router"
+  scp "$_cfullchain" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.cer"
+  DEPLOY_SCRIPT_CMD="/system script add name=\"LE Cert Deploy - $_cdomain\" owner=admin policy=ftp,read,write,password,sensitive \
+source=\"## generated by routeros deploy script in acme.sh;\
+\n/certificate remove [ find name=$_cdomain.cer_0 ];\
 \n/certificate remove [ find name=$_cdomain.cer_1 ];\
-\n/certificate remove [ find name=$_cdomain.cer_2 ];\
 \ndelay 1;\
 \n/certificate import file-name=$_cdomain.cer passphrase=\\\"\\\";\
 \n/certificate import file-name=$_cdomain.key passphrase=\\\"\\\";\
 \ndelay 1;\
-\n:do {/file remove $_cdomain.cer; } on-error={ }\
-\n:do {/file remove $_cdomain.key; } on-error={ }\
+\n/file remove $_cdomain.cer;\
+\n/file remove $_cdomain.key;\
 \ndelay 2;\
 \n/ip service set www-ssl certificate=$_cdomain.cer_0;\
 \n$ROUTER_OS_ADDITIONAL_SERVICES;\
 \n\"
 "
-
-  if ! _ssh_remote_cmd "$DEPLOY_SCRIPT_CMD"; then
-    return $_err_code
-  fi
-
-  if ! _ssh_remote_cmd "/system script run \"LECertDeploy-$_cdomain\""; then
-    return $_err_code
-  fi
-
-  if ! _ssh_remote_cmd "/system script remove \"LECertDeploy-$_cdomain\""; then
-    return $_err_code
-  fi
+  # shellcheck disable=SC2029
+  ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "$DEPLOY_SCRIPT_CMD"
+  # shellcheck disable=SC2029
+  ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script run \"LE Cert Deploy - $_cdomain\""
+  # shellcheck disable=SC2029
+  ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script remove \"LE Cert Deploy - $_cdomain\""
 
   return 0
 }
-
-# inspired by deploy/ssh.sh
-_ssh_remote_cmd() {
-  _cmd="$1"
-  _secure_debug "Remote commands to execute: $_cmd"
-  _info "Submitting sequence of commands to routeros"
-  # quotations in bash cmd below intended.  Squash travis spellcheck error
-  # shellcheck disable=SC2029
-  $ROUTER_OS_SSH_CMD "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "$_cmd"
-  _err_code="$?"
-
-  if [ "$_err_code" != "0" ]; then
-    _err "Error code $_err_code returned from routeros"
-  fi
-
-  return $_err_code
-}
-
-_scp_certificate() {
-  _src="$1"
-  _dst="$2"
-  _secure_debug "scp '$_src' to '$_dst'"
-  _info "Push key '$_src' to routeros"
-
-  $ROUTER_OS_SCP_CMD "$_src" "$_dst"
-  _err_code="$?"
-
-  if [ "$_err_code" != "0" ]; then
-    _err "Error code $_err_code returned from scp"
-  fi
-
-  return $_err_code
-}

deploy/ssh.sh

@@ -14,7 +14,7 @@
 # The following examples are for QNAP NAS running QTS 4.2
 # export DEPLOY_SSH_CMD=""  # defaults to "ssh -T"
 # export DEPLOY_SSH_USER="admin"  # required
-# export DEPLOY_SSH_SERVER="host1 host2:8022 192.168.0.1:9022"  # defaults to domain name, support multiple servers with optional port
+# export DEPLOY_SSH_SERVER="qnap"  # defaults to domain name
 # export DEPLOY_SSH_KEYFILE="/etc/stunnel/stunnel.pem"
 # export DEPLOY_SSH_CERTFILE="/etc/stunnel/stunnel.pem"
 # export DEPLOY_SSH_CAFILE="/etc/stunnel/uca.pem"
@@ -23,8 +23,6 @@
 # export DEPLOY_SSH_BACKUP=""  # yes or no, default to yes or previously saved value
 # export DEPLOY_SSH_BACKUP_PATH=".acme_ssh_deploy"  # path on remote system. Defaults to .acme_ssh_deploy
 # export DEPLOY_SSH_MULTI_CALL=""  # yes or no, default to no or previously saved value
-# export DEPLOY_SSH_USE_SCP="" yes or no, default to no
-# export DEPLOY_SSH_SCP_CMD="" defaults to "scp -q"
 #
 ########  Public functions #####################
 
@@ -37,6 +35,11 @@ ssh_deploy() {
   _cfullchain="$5"
   _deploy_ssh_servers=""
 
+  if [ -f "$DOMAIN_CONF" ]; then
+    # shellcheck disable=SC1090
+    . "$DOMAIN_CONF"
+  fi
+
   _debug _cdomain "$_cdomain"
   _debug _ckey "$_ckey"
   _debug _ccert "$_ccert"
@@ -44,134 +47,60 @@ ssh_deploy() {
   _debug _cfullchain "$_cfullchain"
 
   # USER is required to login by SSH to remote host.
-  _migratedeployconf Le_Deploy_ssh_user DEPLOY_SSH_USER
-  _getdeployconf DEPLOY_SSH_USER
-  _debug2 DEPLOY_SSH_USER "$DEPLOY_SSH_USER"
   if [ -z "$DEPLOY_SSH_USER" ]; then
-    _err "DEPLOY_SSH_USER not defined."
-    return 1
+    if [ -z "$Le_Deploy_ssh_user" ]; then
+      _err "DEPLOY_SSH_USER not defined."
+      return 1
+    fi
+  else
+    Le_Deploy_ssh_user="$DEPLOY_SSH_USER"
+    _savedomainconf Le_Deploy_ssh_user "$Le_Deploy_ssh_user"
   fi
-  _savedeployconf DEPLOY_SSH_USER "$DEPLOY_SSH_USER"
 
   # SERVER is optional. If not provided then use _cdomain
-  _migratedeployconf Le_Deploy_ssh_server DEPLOY_SSH_SERVER
-  _getdeployconf DEPLOY_SSH_SERVER
-  _debug2 DEPLOY_SSH_SERVER "$DEPLOY_SSH_SERVER"
-  if [ -z "$DEPLOY_SSH_SERVER" ]; then
-    DEPLOY_SSH_SERVER="$_cdomain"
+  if [ -n "$DEPLOY_SSH_SERVER" ]; then
+    Le_Deploy_ssh_server="$DEPLOY_SSH_SERVER"
+    _savedomainconf Le_Deploy_ssh_server "$Le_Deploy_ssh_server"
+  elif [ -z "$Le_Deploy_ssh_server" ]; then
+    Le_Deploy_ssh_server="$_cdomain"
   fi
-  _savedeployconf DEPLOY_SSH_SERVER "$DEPLOY_SSH_SERVER"
 
   # CMD is optional. If not provided then use ssh
-  _migratedeployconf Le_Deploy_ssh_cmd DEPLOY_SSH_CMD
-  _getdeployconf DEPLOY_SSH_CMD
-  _debug2 DEPLOY_SSH_CMD "$DEPLOY_SSH_CMD"
-  if [ -z "$DEPLOY_SSH_CMD" ]; then
-    DEPLOY_SSH_CMD="ssh -T"
+  if [ -n "$DEPLOY_SSH_CMD" ]; then
+    Le_Deploy_ssh_cmd="$DEPLOY_SSH_CMD"
+    _savedomainconf Le_Deploy_ssh_cmd "$Le_Deploy_ssh_cmd"
+  elif [ -z "$Le_Deploy_ssh_cmd" ]; then
+    Le_Deploy_ssh_cmd="ssh -T"
   fi
-  _savedeployconf DEPLOY_SSH_CMD "$DEPLOY_SSH_CMD"
 
   # BACKUP is optional. If not provided then default to previously saved value or yes.
-  _migratedeployconf Le_Deploy_ssh_backup DEPLOY_SSH_BACKUP
-  _getdeployconf DEPLOY_SSH_BACKUP
-  _debug2 DEPLOY_SSH_BACKUP "$DEPLOY_SSH_BACKUP"
-  if [ -z "$DEPLOY_SSH_BACKUP" ]; then
-    DEPLOY_SSH_BACKUP="yes"
+  if [ "$DEPLOY_SSH_BACKUP" = "no" ]; then
+    Le_Deploy_ssh_backup="no"
+  elif [ -z "$Le_Deploy_ssh_backup" ] || [ "$DEPLOY_SSH_BACKUP" = "yes" ]; then
+    Le_Deploy_ssh_backup="yes"
   fi
-  _savedeployconf DEPLOY_SSH_BACKUP "$DEPLOY_SSH_BACKUP"
+  _savedomainconf Le_Deploy_ssh_backup "$Le_Deploy_ssh_backup"
 
   # BACKUP_PATH is optional. If not provided then default to previously saved value or .acme_ssh_deploy
-  _migratedeployconf Le_Deploy_ssh_backup_path DEPLOY_SSH_BACKUP_PATH
-  _getdeployconf DEPLOY_SSH_BACKUP_PATH
-  _debug2 DEPLOY_SSH_BACKUP_PATH "$DEPLOY_SSH_BACKUP_PATH"
-  if [ -z "$DEPLOY_SSH_BACKUP_PATH" ]; then
-    DEPLOY_SSH_BACKUP_PATH=".acme_ssh_deploy"
+  if [ -n "$DEPLOY_SSH_BACKUP_PATH" ]; then
+    Le_Deploy_ssh_backup_path="$DEPLOY_SSH_BACKUP_PATH"
+  elif [ -z "$Le_Deploy_ssh_backup_path" ]; then
+    Le_Deploy_ssh_backup_path=".acme_ssh_deploy"
   fi
-  _savedeployconf DEPLOY_SSH_BACKUP_PATH "$DEPLOY_SSH_BACKUP_PATH"
+  _savedomainconf Le_Deploy_ssh_backup_path "$Le_Deploy_ssh_backup_path"
 
   # MULTI_CALL is optional. If not provided then default to previously saved
   # value (which may be undefined... equivalent to "no").
-  _migratedeployconf Le_Deploy_ssh_multi_call DEPLOY_SSH_MULTI_CALL
-  _getdeployconf DEPLOY_SSH_MULTI_CALL
-  _debug2 DEPLOY_SSH_MULTI_CALL "$DEPLOY_SSH_MULTI_CALL"
-  if [ -z "$DEPLOY_SSH_MULTI_CALL" ]; then
-    DEPLOY_SSH_MULTI_CALL="no"
-  fi
-  _savedeployconf DEPLOY_SSH_MULTI_CALL "$DEPLOY_SSH_MULTI_CALL"
-
-  # KEYFILE is optional.
-  # If provided then private key will be copied to provided filename.
-  _migratedeployconf Le_Deploy_ssh_keyfile DEPLOY_SSH_KEYFILE
-  _getdeployconf DEPLOY_SSH_KEYFILE
-  _debug2 DEPLOY_SSH_KEYFILE "$DEPLOY_SSH_KEYFILE"
-  if [ -n "$DEPLOY_SSH_KEYFILE" ]; then
-    _savedeployconf DEPLOY_SSH_KEYFILE "$DEPLOY_SSH_KEYFILE"
+  if [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
+    Le_Deploy_ssh_multi_call="yes"
+    _savedomainconf Le_Deploy_ssh_multi_call "$Le_Deploy_ssh_multi_call"
+  elif [ "$DEPLOY_SSH_MULTI_CALL" = "no" ]; then
+    Le_Deploy_ssh_multi_call=""
+    _cleardomainconf Le_Deploy_ssh_multi_call
   fi
 
-  # CERTFILE is optional.
-  # If provided then certificate will be copied or appended to provided filename.
-  _migratedeployconf Le_Deploy_ssh_certfile DEPLOY_SSH_CERTFILE
-  _getdeployconf DEPLOY_SSH_CERTFILE
-  _debug2 DEPLOY_SSH_CERTFILE "$DEPLOY_SSH_CERTFILE"
-  if [ -n "$DEPLOY_SSH_CERTFILE" ]; then
-    _savedeployconf DEPLOY_SSH_CERTFILE "$DEPLOY_SSH_CERTFILE"
-  fi
-
-  # CAFILE is optional.
-  # If provided then CA intermediate certificate will be copied or appended to provided filename.
-  _migratedeployconf Le_Deploy_ssh_cafile DEPLOY_SSH_CAFILE
-  _getdeployconf DEPLOY_SSH_CAFILE
-  _debug2 DEPLOY_SSH_CAFILE "$DEPLOY_SSH_CAFILE"
-  if [ -n "$DEPLOY_SSH_CAFILE" ]; then
-    _savedeployconf DEPLOY_SSH_CAFILE "$DEPLOY_SSH_CAFILE"
-  fi
-
-  # FULLCHAIN is optional.
-  # If provided then fullchain certificate will be copied or appended to provided filename.
-  _migratedeployconf Le_Deploy_ssh_fullchain DEPLOY_SSH_FULLCHAIN
-  _getdeployconf DEPLOY_SSH_FULLCHAIN
-  _debug2 DEPLOY_SSH_FULLCHAIN "$DEPLOY_SSH_FULLCHAIN"
-  if [ -n "$DEPLOY_SSH_FULLCHAIN" ]; then
-    _savedeployconf DEPLOY_SSH_FULLCHAIN "$DEPLOY_SSH_FULLCHAIN"
-  fi
-
-  # REMOTE_CMD is optional.
-  # If provided then this command will be executed on remote host.
-  _migratedeployconf Le_Deploy_ssh_remote_cmd DEPLOY_SSH_REMOTE_CMD
-  _getdeployconf DEPLOY_SSH_REMOTE_CMD
-  _debug2 DEPLOY_SSH_REMOTE_CMD "$DEPLOY_SSH_REMOTE_CMD"
-  if [ -n "$DEPLOY_SSH_REMOTE_CMD" ]; then
-    _savedeployconf DEPLOY_SSH_REMOTE_CMD "$DEPLOY_SSH_REMOTE_CMD"
-  fi
-
-  # USE_SCP is optional. If not provided then default to previously saved
-  # value (which may be undefined... equivalent to "no").
-  _getdeployconf DEPLOY_SSH_USE_SCP
-  _debug2 DEPLOY_SSH_USE_SCP "$DEPLOY_SSH_USE_SCP"
-  if [ -z "$DEPLOY_SSH_USE_SCP" ]; then
-    DEPLOY_SSH_USE_SCP="no"
-  fi
-  _savedeployconf DEPLOY_SSH_USE_SCP "$DEPLOY_SSH_USE_SCP"
-
-  # SCP_CMD is optional. If not provided then use scp
-  _getdeployconf DEPLOY_SSH_SCP_CMD
-  _debug2 DEPLOY_SSH_SCP_CMD "$DEPLOY_SSH_SCP_CMD"
-  if [ -z "$DEPLOY_SSH_SCP_CMD" ]; then
-    DEPLOY_SSH_SCP_CMD="scp -q"
-  fi
-  _savedeployconf DEPLOY_SSH_SCP_CMD "$DEPLOY_SSH_SCP_CMD"
-
-  if [ "$DEPLOY_SSH_USE_SCP" = "yes" ]; then
-    DEPLOY_SSH_MULTI_CALL="yes"
-    _info "Using scp as alternate method for copying files. Multicall Mode is implicit"
-  elif [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
-    _info "Using MULTI_CALL mode... Required commands sent in multiple calls to remote host"
-  else
-    _info "Required commands batched and sent in single call to remote host"
-  fi
-
-  _deploy_ssh_servers="$DEPLOY_SSH_SERVER"
-  for DEPLOY_SSH_SERVER in $_deploy_ssh_servers; do
+  _deploy_ssh_servers=$Le_Deploy_ssh_server
+  for Le_Deploy_ssh_server in $_deploy_ssh_servers; do
     _ssh_deploy
   done
 }
@@ -181,25 +110,16 @@ _ssh_deploy() {
   _cmdstr=""
   _backupprefix=""
   _backupdir=""
-  _local_cert_file=""
-  _local_ca_file=""
-  _local_full_file=""
 
-  case $DEPLOY_SSH_SERVER in
-  *:*)
-    _host=${DEPLOY_SSH_SERVER%:*}
-    _port=${DEPLOY_SSH_SERVER##*:}
-    ;;
-  *)
-    _host=$DEPLOY_SSH_SERVER
-    _port=
-    ;;
-  esac
+  _info "Deploy certificates to remote server $Le_Deploy_ssh_user@$Le_Deploy_ssh_server"
+  if [ "$Le_Deploy_ssh_multi_call" = "yes" ]; then
+    _info "Using MULTI_CALL mode... Required commands sent in multiple calls to remote host"
+  else
+    _info "Required commands batched and sent in single call to remote host"
+  fi
 
-  _info "Deploy certificates to remote server $DEPLOY_SSH_USER@$_host:$_port"
-
-  if [ "$DEPLOY_SSH_BACKUP" = "yes" ]; then
-    _backupprefix="$DEPLOY_SSH_BACKUP_PATH/$_cdomain-backup"
+  if [ "$Le_Deploy_ssh_backup" = "yes" ]; then
+    _backupprefix="$Le_Deploy_ssh_backup_path/$_cdomain-backup"
     _backupdir="$_backupprefix-$(_utc_date | tr ' ' '-')"
     # run cleanup on the backup directory, erase all older
     # than 180 days (15552000 seconds).
@@ -211,7 +131,7 @@ then rm -rf \"\$fn\"; echo \"Backup \$fn deleted as older than 180 days\"; fi; d
     _cmdstr="mkdir -p $_backupdir; $_cmdstr"
     _info "Backup of old certificate files will be placed in remote directory $_backupdir"
     _info "Backup directories erased after 180 days."
-    if [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
+    if [ "$Le_Deploy_ssh_multi_call" = "yes" ]; then
       if ! _ssh_remote_cmd "$_cmdstr"; then
         return $_err_code
       fi
@@ -219,184 +139,119 @@ then rm -rf \"\$fn\"; echo \"Backup \$fn deleted as older than 180 days\"; fi; d
     fi
   fi
 
+  # KEYFILE is optional.
+  # If provided then private key will be copied to provided filename.
   if [ -n "$DEPLOY_SSH_KEYFILE" ]; then
-    if [ "$DEPLOY_SSH_BACKUP" = "yes" ]; then
+    Le_Deploy_ssh_keyfile="$DEPLOY_SSH_KEYFILE"
+    _savedomainconf Le_Deploy_ssh_keyfile "$Le_Deploy_ssh_keyfile"
+  fi
+  if [ -n "$Le_Deploy_ssh_keyfile" ]; then
+    if [ "$Le_Deploy_ssh_backup" = "yes" ]; then
       # backup file we are about to overwrite.
-      _cmdstr="$_cmdstr cp $DEPLOY_SSH_KEYFILE $_backupdir >/dev/null;"
-      if [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
-        if ! _ssh_remote_cmd "$_cmdstr"; then
-          return $_err_code
-        fi
-        _cmdstr=""
-      fi
+      _cmdstr="$_cmdstr cp $Le_Deploy_ssh_keyfile $_backupdir >/dev/null;"
     fi
-
-    # copy new key into file.
-    if [ "$DEPLOY_SSH_USE_SCP" = "yes" ]; then
-      # scp the file
-      if ! _scp_remote_cmd "$_ckey" "$DEPLOY_SSH_KEYFILE"; then
+    # copy new certificate into file.
+    _cmdstr="$_cmdstr echo \"$(cat "$_ckey")\" > $Le_Deploy_ssh_keyfile;"
+    _info "will copy private key to remote file $Le_Deploy_ssh_keyfile"
+    if [ "$Le_Deploy_ssh_multi_call" = "yes" ]; then
+      if ! _ssh_remote_cmd "$_cmdstr"; then
         return $_err_code
       fi
-    else
-      # ssh echo to the file
-      _cmdstr="$_cmdstr echo \"$(cat "$_ckey")\" > $DEPLOY_SSH_KEYFILE;"
-      _info "will copy private key to remote file $DEPLOY_SSH_KEYFILE"
-      if [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
-        if ! _ssh_remote_cmd "$_cmdstr"; then
-          return $_err_code
-        fi
-        _cmdstr=""
-      fi
+      _cmdstr=""
     fi
   fi
 
+  # CERTFILE is optional.
+  # If provided then certificate will be copied or appended to provided filename.
   if [ -n "$DEPLOY_SSH_CERTFILE" ]; then
+    Le_Deploy_ssh_certfile="$DEPLOY_SSH_CERTFILE"
+    _savedomainconf Le_Deploy_ssh_certfile "$Le_Deploy_ssh_certfile"
+  fi
+  if [ -n "$Le_Deploy_ssh_certfile" ]; then
     _pipe=">"
-    if [ "$DEPLOY_SSH_CERTFILE" = "$DEPLOY_SSH_KEYFILE" ]; then
+    if [ "$Le_Deploy_ssh_certfile" = "$Le_Deploy_ssh_keyfile" ]; then
       # if filename is same as previous file then append.
       _pipe=">>"
-    elif [ "$DEPLOY_SSH_BACKUP" = "yes" ]; then
+    elif [ "$Le_Deploy_ssh_backup" = "yes" ]; then
       # backup file we are about to overwrite.
-      _cmdstr="$_cmdstr cp $DEPLOY_SSH_CERTFILE $_backupdir >/dev/null;"
-      if [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
-        if ! _ssh_remote_cmd "$_cmdstr"; then
-          return $_err_code
-        fi
-        _cmdstr=""
-      fi
+      _cmdstr="$_cmdstr cp $Le_Deploy_ssh_certfile $_backupdir >/dev/null;"
     fi
-
     # copy new certificate into file.
-    if [ "$DEPLOY_SSH_USE_SCP" = "yes" ]; then
-      # scp the file
-      _local_cert_file=$(_mktemp)
-      if [ "$DEPLOY_SSH_CERTFILE" = "$DEPLOY_SSH_KEYFILE" ]; then
-        cat "$_ckey" >>"$_local_cert_file"
-      fi
-      cat "$_ccert" >>"$_local_cert_file"
-      if ! _scp_remote_cmd "$_local_cert_file" "$DEPLOY_SSH_CERTFILE"; then
+    _cmdstr="$_cmdstr echo \"$(cat "$_ccert")\" $_pipe $Le_Deploy_ssh_certfile;"
+    _info "will copy certificate to remote file $Le_Deploy_ssh_certfile"
+    if [ "$Le_Deploy_ssh_multi_call" = "yes" ]; then
+      if ! _ssh_remote_cmd "$_cmdstr"; then
         return $_err_code
       fi
-    else
-      # ssh echo to the file
-      _cmdstr="$_cmdstr echo \"$(cat "$_ccert")\" $_pipe $DEPLOY_SSH_CERTFILE;"
-      _info "will copy certificate to remote file $DEPLOY_SSH_CERTFILE"
-      if [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
-        if ! _ssh_remote_cmd "$_cmdstr"; then
-          return $_err_code
-        fi
-        _cmdstr=""
-      fi
+      _cmdstr=""
     fi
   fi
 
+  # CAFILE is optional.
+  # If provided then CA intermediate certificate will be copied or appended to provided filename.
   if [ -n "$DEPLOY_SSH_CAFILE" ]; then
+    Le_Deploy_ssh_cafile="$DEPLOY_SSH_CAFILE"
+    _savedomainconf Le_Deploy_ssh_cafile "$Le_Deploy_ssh_cafile"
+  fi
+  if [ -n "$Le_Deploy_ssh_cafile" ]; then
     _pipe=">"
-    if [ "$DEPLOY_SSH_CAFILE" = "$DEPLOY_SSH_KEYFILE" ] ||
-      [ "$DEPLOY_SSH_CAFILE" = "$DEPLOY_SSH_CERTFILE" ]; then
+    if [ "$Le_Deploy_ssh_cafile" = "$Le_Deploy_ssh_keyfile" ] ||
+      [ "$Le_Deploy_ssh_cafile" = "$Le_Deploy_ssh_certfile" ]; then
       # if filename is same as previous file then append.
       _pipe=">>"
-    elif [ "$DEPLOY_SSH_BACKUP" = "yes" ]; then
+    elif [ "$Le_Deploy_ssh_backup" = "yes" ]; then
       # backup file we are about to overwrite.
-      _cmdstr="$_cmdstr cp $DEPLOY_SSH_CAFILE $_backupdir >/dev/null;"
-      if [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
-        if ! _ssh_remote_cmd "$_cmdstr"; then
-          return $_err_code
-        fi
-        _cmdstr=""
-      fi
+      _cmdstr="$_cmdstr cp $Le_Deploy_ssh_cafile $_backupdir >/dev/null;"
     fi
-
     # copy new certificate into file.
-    if [ "$DEPLOY_SSH_USE_SCP" = "yes" ]; then
-      # scp the file
-      _local_ca_file=$(_mktemp)
-      if [ "$DEPLOY_SSH_CAFILE" = "$DEPLOY_SSH_KEYFILE" ]; then
-        cat "$_ckey" >>"$_local_ca_file"
-      fi
-      if [ "$DEPLOY_SSH_CAFILE" = "$DEPLOY_SSH_CERTFILE" ]; then
-        cat "$_ccert" >>"$_local_ca_file"
-      fi
-      cat "$_cca" >>"$_local_ca_file"
-      if ! _scp_remote_cmd "$_local_ca_file" "$DEPLOY_SSH_CAFILE"; then
+    _cmdstr="$_cmdstr echo \"$(cat "$_cca")\" $_pipe $Le_Deploy_ssh_cafile;"
+    _info "will copy CA file to remote file $Le_Deploy_ssh_cafile"
+    if [ "$Le_Deploy_ssh_multi_call" = "yes" ]; then
+      if ! _ssh_remote_cmd "$_cmdstr"; then
         return $_err_code
       fi
-    else
-      # ssh echo to the file
-      _cmdstr="$_cmdstr echo \"$(cat "$_cca")\" $_pipe $DEPLOY_SSH_CAFILE;"
-      _info "will copy CA file to remote file $DEPLOY_SSH_CAFILE"
-      if [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
-        if ! _ssh_remote_cmd "$_cmdstr"; then
-          return $_err_code
-        fi
-        _cmdstr=""
-      fi
+      _cmdstr=""
     fi
   fi
 
+  # FULLCHAIN is optional.
+  # If provided then fullchain certificate will be copied or appended to provided filename.
   if [ -n "$DEPLOY_SSH_FULLCHAIN" ]; then
+    Le_Deploy_ssh_fullchain="$DEPLOY_SSH_FULLCHAIN"
+    _savedomainconf Le_Deploy_ssh_fullchain "$Le_Deploy_ssh_fullchain"
+  fi
+  if [ -n "$Le_Deploy_ssh_fullchain" ]; then
     _pipe=">"
-    if [ "$DEPLOY_SSH_FULLCHAIN" = "$DEPLOY_SSH_KEYFILE" ] ||
-      [ "$DEPLOY_SSH_FULLCHAIN" = "$DEPLOY_SSH_CERTFILE" ] ||
-      [ "$DEPLOY_SSH_FULLCHAIN" = "$DEPLOY_SSH_CAFILE" ]; then
+    if [ "$Le_Deploy_ssh_fullchain" = "$Le_Deploy_ssh_keyfile" ] ||
+      [ "$Le_Deploy_ssh_fullchain" = "$Le_Deploy_ssh_certfile" ] ||
+      [ "$Le_Deploy_ssh_fullchain" = "$Le_Deploy_ssh_cafile" ]; then
       # if filename is same as previous file then append.
       _pipe=">>"
-    elif [ "$DEPLOY_SSH_BACKUP" = "yes" ]; then
+    elif [ "$Le_Deploy_ssh_backup" = "yes" ]; then
       # backup file we are about to overwrite.
-      _cmdstr="$_cmdstr cp $DEPLOY_SSH_FULLCHAIN $_backupdir >/dev/null;"
-      if [ "$DEPLOY_SSH_FULLCHAIN" = "yes" ]; then
-        if ! _ssh_remote_cmd "$_cmdstr"; then
-          return $_err_code
-        fi
-        _cmdstr=""
-      fi
+      _cmdstr="$_cmdstr cp $Le_Deploy_ssh_fullchain $_backupdir >/dev/null;"
     fi
-
     # copy new certificate into file.
-    if [ "$DEPLOY_SSH_USE_SCP" = "yes" ]; then
-      # scp the file
-      _local_full_file=$(_mktemp)
-      if [ "$DEPLOY_SSH_FULLCHAIN" = "$DEPLOY_SSH_KEYFILE" ]; then
-        cat "$_ckey" >>"$_local_full_file"
-      fi
-      if [ "$DEPLOY_SSH_FULLCHAIN" = "$DEPLOY_SSH_CERTFILE" ]; then
-        cat "$_ccert" >>"$_local_full_file"
-      fi
-      if [ "$DEPLOY_SSH_FULLCHAIN" = "$DEPLOY_SSH_CAFILE" ]; then
-        cat "$_cca" >>"$_local_full_file"
-      fi
-      cat "$_cfullchain" >>"$_local_full_file"
-      if ! _scp_remote_cmd "$_local_full_file" "$DEPLOY_SSH_FULLCHAIN"; then
+    _cmdstr="$_cmdstr echo \"$(cat "$_cfullchain")\" $_pipe $Le_Deploy_ssh_fullchain;"
+    _info "will copy fullchain to remote file $Le_Deploy_ssh_fullchain"
+    if [ "$Le_Deploy_ssh_multi_call" = "yes" ]; then
+      if ! _ssh_remote_cmd "$_cmdstr"; then
         return $_err_code
       fi
-    else
-      # ssh echo to the file
-      _cmdstr="$_cmdstr echo \"$(cat "$_cfullchain")\" $_pipe $DEPLOY_SSH_FULLCHAIN;"
-      _info "will copy fullchain to remote file $DEPLOY_SSH_FULLCHAIN"
-      if [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
-        if ! _ssh_remote_cmd "$_cmdstr"; then
-          return $_err_code
-        fi
-        _cmdstr=""
-      fi
+      _cmdstr=""
     fi
   fi
 
-  # cleanup local files if any
-  if [ -f "$_local_cert_file" ]; then
-    rm -f "$_local_cert_file"
-  fi
-  if [ -f "$_local_ca_file" ]; then
-    rm -f "$_local_ca_file"
-  fi
-  if [ -f "$_local_full_file" ]; then
-    rm -f "$_local_full_file"
-  fi
-
+  # REMOTE_CMD is optional.
+  # If provided then this command will be executed on remote host.
   if [ -n "$DEPLOY_SSH_REMOTE_CMD" ]; then
-    _cmdstr="$_cmdstr $DEPLOY_SSH_REMOTE_CMD;"
-    _info "Will execute remote command $DEPLOY_SSH_REMOTE_CMD"
-    if [ "$DEPLOY_SSH_MULTI_CALL" = "yes" ]; then
+    Le_Deploy_ssh_remote_cmd="$DEPLOY_SSH_REMOTE_CMD"
+    _savedomainconf Le_Deploy_ssh_remote_cmd "$Le_Deploy_ssh_remote_cmd"
+  fi
+  if [ -n "$Le_Deploy_ssh_remote_cmd" ]; then
+    _cmdstr="$_cmdstr $Le_Deploy_ssh_remote_cmd;"
+    _info "Will execute remote command $Le_Deploy_ssh_remote_cmd"
+    if [ "$Le_Deploy_ssh_multi_call" = "yes" ]; then
       if ! _ssh_remote_cmd "$_cmdstr"; then
         return $_err_code
       fi
@@ -410,25 +265,17 @@ then rm -rf \"\$fn\"; echo \"Backup \$fn deleted as older than 180 days\"; fi; d
       return $_err_code
     fi
   fi
-  # cleanup in case all is ok
   return 0
 }
 
 #cmd
 _ssh_remote_cmd() {
   _cmd="$1"
-
-  _ssh_cmd="$DEPLOY_SSH_CMD"
-  if [ -n "$_port" ]; then
-    _ssh_cmd="$_ssh_cmd -p $_port"
-  fi
-
   _secure_debug "Remote commands to execute: $_cmd"
-  _info "Submitting sequence of commands to remote server by $_ssh_cmd"
-
+  _info "Submitting sequence of commands to remote server by ssh"
   # quotations in bash cmd below intended.  Squash travis spellcheck error
   # shellcheck disable=SC2029
-  $_ssh_cmd "$DEPLOY_SSH_USER@$_host" sh -c "'$_cmd'"
+  $Le_Deploy_ssh_cmd "$Le_Deploy_ssh_user@$Le_Deploy_ssh_server" sh -c "'$_cmd'"
   _err_code="$?"
 
   if [ "$_err_code" != "0" ]; then
@@ -437,26 +284,3 @@ _ssh_remote_cmd() {
 
   return $_err_code
 }
-
-# cmd scp
-_scp_remote_cmd() {
-  _src=$1
-  _dest=$2
-
-  _scp_cmd="$DEPLOY_SSH_SCP_CMD"
-  if [ -n "$_port" ]; then
-    _scp_cmd="$_scp_cmd -P $_port"
-  fi
-
-  _secure_debug "Remote copy source $_src to destination $_dest"
-  _info "Submitting secure copy by $_scp_cmd"
-
-  $_scp_cmd "$_src" "$DEPLOY_SSH_USER"@"$_host":"$_dest"
-  _err_code="$?"
-
-  if [ "$_err_code" != "0" ]; then
-    _err "Error code $_err_code returned from scp"
-  fi
-
-  return $_err_code
-}

deploy/synology_dsm.sh

@@ -1,53 +1,29 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
-################################################################################
-# ACME.sh 3rd party deploy plugin for Synology DSM
-################################################################################
-# Authors: Brian Hartvigsen (creator), https://github.com/tresni
-#          Martin Arndt (contributor), https://troublezone.net/
-# Updated: 2023-07-03
-# Issues:  https://github.com/acmesh-official/acme.sh/issues/2727
-################################################################################
-# Usage (shown values are the examples):
-# 1. Set required environment variables:
-# - use automatically created temp admin user to authenticate
-#   export SYNO_USE_TEMP_ADMIN=1
-# - or provide your own admin user credential to authenticate
-#   1. export SYNO_USERNAME="adminUser"
-#   2. export SYNO_PASSWORD="adminPassword"
-# 2. Set optional environment variables
-# - common optional variables
-#   - export SYNO_SCHEME="http"         - defaults to "http"
-#   - export SYNO_HOSTNAME="localhost"  - defaults to "localhost"
-#   - export SYNO_PORT="5000"           - defaults to "5000"
-#   - export SYNO_CREATE=1 - to allow creating the cert if it doesn't exist
-#   - export SYNO_CERTIFICATE="" - to replace a specific cert by its
-#                                    description
-# - temp admin optional variables
-#   - export SYNO_LOCAL_HOSTNAME=1   - if set to 1, force to treat hostname is
-#                                      targeting current local machine (since
-#                                      this method only locally supported)
-# - exsiting admin 2FA-OTP optional variables
-#   - export SYNO_OTP_CODE="XXXXXX" - if set, script won't require to
-#                                     interactive input the OTP code
-#   - export SYNO_DEVICE_NAME="CertRenewal" - if set, script won't require to
-#                                             interactive input the device name
-#   - export SYNO_DEVICE_ID=""      - (deprecated, auth with OTP code instead)
-#                                     required for omitting 2FA-OTP
-# 3. Run command:
-# acme.sh --deploy --deploy-hook synology_dsm -d example.com
-################################################################################
-# Dependencies:
-# - curl
-# - synouser & synogroup & synosetkeyvalue (Required for SYNO_USE_TEMP_ADMIN=1)
-################################################################################
-# Return value:
-# 0 means success, otherwise error.
-################################################################################
+# Here is a script to deploy cert to Synology DSM
+#
+# it requires the jq and curl are in the $PATH and the following
+# environment variables must be set:
+#
+# SYNO_Username - Synology Username to login (must be an administrator)
+# SYNO_Password - Synology Password to login
+# SYNO_Certificate - Certificate description to target for replacement
+#
+# The following environmental variables may be set if you don't like their
+# default values:
+#
+# SYNO_Scheme - defaults to http
+# SYNO_Hostname - defaults to localhost
+# SYNO_Port - defaults to 5000
+# SYNO_DID - device ID to skip OTP - defaults to empty
+#
+#returns 0 means success, otherwise error.
+
+########  Public functions #####################
 
-########## Public functions ####################################################
 #domain keyfile certfile cafile fullchain
 synology_dsm_deploy() {
+
   _cdomain="$1"
   _ckey="$2"
   _ccert="$3"
@@ -55,391 +31,128 @@ synology_dsm_deploy() {
 
   _debug _cdomain "$_cdomain"
 
-  # Get username and password, but don't save until we authenticated successfully
-  _migratedeployconf SYNO_Username SYNO_USERNAME
-  _migratedeployconf SYNO_Password SYNO_PASSWORD
-  _migratedeployconf SYNO_Device_ID SYNO_DEVICE_ID
-  _migratedeployconf SYNO_Device_Name SYNO_DEVICE_NAME
-  _getdeployconf SYNO_USERNAME
-  _getdeployconf SYNO_PASSWORD
-  _getdeployconf SYNO_DEVICE_ID
-  _getdeployconf SYNO_DEVICE_NAME
-
-  # Prepare to use temp admin if SYNO_USE_TEMP_ADMIN is set
-  _getdeployconf SYNO_USE_TEMP_ADMIN
-  _check2cleardeployconfexp SYNO_USE_TEMP_ADMIN
-  _debug2 SYNO_USE_TEMP_ADMIN "$SYNO_USE_TEMP_ADMIN"
-
-  if [ -n "$SYNO_USE_TEMP_ADMIN" ]; then
-    if ! _exists synouser || ! _exists synogroup || ! _exists synosetkeyvalue; then
-      _err "Missing required tools to creat temp admin user, please set SYNO_USERNAME and SYNO_PASSWORD instead."
-      _err "Notice: temp admin user authorization method only supports local deployment on DSM."
-      return 1
-    fi
-    if synouser --help 2>&1 | grep -q 'Permission denied'; then
-      _err "For creating temp admin user, the deploy script must be run as root."
-      return 1
-    fi
-
-    [ -n "$SYNO_USERNAME" ] || _savedeployconf SYNO_USERNAME ""
-    [ -n "$SYNO_PASSWORD" ] || _savedeployconf SYNO_PASSWORD ""
-
-    _debug "Setting temp admin user credential..."
-    SYNO_USERNAME=sc-acmesh-tmp
-    SYNO_PASSWORD=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)
-    # Set 2FA-OTP settings to empty consider they won't be needed.
-    SYNO_DEVICE_ID=
-    SYNO_DEVICE_NAME=
-    SYNO_OTP_CODE=
-  else
-    _debug2 SYNO_USERNAME "$SYNO_USERNAME"
-    _secure_debug2 SYNO_PASSWORD "$SYNO_PASSWORD"
-    _debug2 SYNO_DEVICE_NAME "$SYNO_DEVICE_NAME"
-    _secure_debug2 SYNO_DEVICE_ID "$SYNO_DEVICE_ID"
-  fi
-
-  if [ -z "$SYNO_USERNAME" ] || [ -z "$SYNO_PASSWORD" ]; then
-    _err "You must set either SYNO_USE_TEMP_ADMIN, or set both SYNO_USERNAME and SYNO_PASSWORD."
+  # Get Username and Password, but don't save until we successfully authenticate
+  _getdeployconf SYNO_Username
+  _getdeployconf SYNO_Password
+  _getdeployconf SYNO_Create
+  _getdeployconf SYNO_DID
+  if [ -z "${SYNO_Username:-}" ] || [ -z "${SYNO_Password:-}" ]; then
+    _err "SYNO_Username & SYNO_Password must be set"
     return 1
   fi
+  _debug2 SYNO_Username "$SYNO_Username"
+  _secure_debug2 SYNO_Password "$SYNO_Password"
 
-  # Optional scheme, hostname and port for Synology DSM
-  _migratedeployconf SYNO_Scheme SYNO_SCHEME
-  _migratedeployconf SYNO_Hostname SYNO_HOSTNAME
-  _migratedeployconf SYNO_Port SYNO_PORT
-  _getdeployconf SYNO_SCHEME
-  _getdeployconf SYNO_HOSTNAME
-  _getdeployconf SYNO_PORT
+  # Optional scheme, hostname, and port for Synology DSM
+  _getdeployconf SYNO_Scheme
+  _getdeployconf SYNO_Hostname
+  _getdeployconf SYNO_Port
 
-  # Default values for scheme, hostname and port
-  # Defaulting to localhost and http, because it's localhost…
-  [ -n "$SYNO_SCHEME" ] || SYNO_SCHEME=http
-  [ -n "$SYNO_HOSTNAME" ] || SYNO_HOSTNAME=localhost
-  [ -n "$SYNO_PORT" ] || SYNO_PORT=5000
-  _savedeployconf SYNO_SCHEME "$SYNO_SCHEME"
-  _savedeployconf SYNO_HOSTNAME "$SYNO_HOSTNAME"
-  _savedeployconf SYNO_PORT "$SYNO_PORT"
-  _debug2 SYNO_SCHEME "$SYNO_SCHEME"
-  _debug2 SYNO_HOSTNAME "$SYNO_HOSTNAME"
-  _debug2 SYNO_PORT "$SYNO_PORT"
+  # default vaules for scheme, hostname, and port
+  # defaulting to localhost and http because it's localhost...
+  [ -n "${SYNO_Scheme}" ] || SYNO_Scheme="http"
+  [ -n "${SYNO_Hostname}" ] || SYNO_Hostname="localhost"
+  [ -n "${SYNO_Port}" ] || SYNO_Port="5000"
 
-  # Get the certificate description, but don't save it until we verify it's real
-  _migratedeployconf SYNO_Certificate SYNO_CERTIFICATE "base64"
-  _getdeployconf SYNO_CERTIFICATE
-  _check2cleardeployconfexp SYNO_CERTIFICATE
-  _debug SYNO_CERTIFICATE "${SYNO_CERTIFICATE:-}"
+  _savedeployconf SYNO_Scheme "$SYNO_Scheme"
+  _savedeployconf SYNO_Hostname "$SYNO_Hostname"
+  _savedeployconf SYNO_Port "$SYNO_Port"
 
-  # shellcheck disable=SC1003 # We are not trying to escape a single quote
-  if printf "%s" "$SYNO_CERTIFICATE" | grep '\\'; then
-    _err "Do not use a backslash (\) in your certificate description"
-    return 1
-  fi
+  _debug2 SYNO_Scheme "$SYNO_Scheme"
+  _debug2 SYNO_Hostname "$SYNO_Hostname"
+  _debug2 SYNO_Port "$SYNO_Port"
 
-  _debug "Getting API version..."
-  _base_url="$SYNO_SCHEME://$SYNO_HOSTNAME:$SYNO_PORT"
+  # Get the certificate description, but don't save it until we verfiy it's real
+  _getdeployconf SYNO_Certificate
+  _debug SYNO_Certificate "${SYNO_Certificate:-}"
+
+  _base_url="$SYNO_Scheme://$SYNO_Hostname:$SYNO_Port"
   _debug _base_url "$_base_url"
+
+  _debug "Getting API version"
   response=$(_get "$_base_url/webapi/query.cgi?api=SYNO.API.Info&version=1&method=query&query=SYNO.API.Auth")
-  api_path=$(echo "$response" | grep "SYNO.API.Auth" | sed -n 's/.*"path" *: *"\([^"]*\)".*/\1/p')
   api_version=$(echo "$response" | grep "SYNO.API.Auth" | sed -n 's/.*"maxVersion" *: *\([0-9]*\).*/\1/p')
   _debug3 response "$response"
-  _debug3 api_path "$api_path"
   _debug3 api_version "$api_version"
 
-  # Login, get the session ID and SynoToken from JSON
-  _info "Logging into $SYNO_HOSTNAME:$SYNO_PORT..."
-  encoded_username="$(printf "%s" "$SYNO_USERNAME" | _url_encode)"
-  encoded_password="$(printf "%s" "$SYNO_PASSWORD" | _url_encode)"
+  # Login, get the token from JSON and session id from cookie
+  _info "Logging into $SYNO_Hostname:$SYNO_Port"
+  encoded_username="$(printf "%s" "$SYNO_Username" | _url_encode)"
+  encoded_password="$(printf "%s" "$SYNO_Password" | _url_encode)"
 
-  # ## START ## - DEPRECATED, for backward compatibility
-  _getdeployconf SYNO_TOTP_SECRET
-
-  if [ -n "$SYNO_TOTP_SECRET" ]; then
-    _info "WARNING: Usage of SYNO_TOTP_SECRET is deprecated!"
-    _info "         See synology_dsm.sh script or ACME.sh Wiki page for details:"
-    _info "         https://github.com/acmesh-official/acme.sh/wiki/Synology-NAS-Guide"
-    if ! _exists oathtool; then
-      _err "oathtool could not be found, install oathtool to use SYNO_TOTP_SECRET"
-      return 1
-    fi
-    DEPRECATED_otp_code="$(oathtool --base32 --totp "$SYNO_TOTP_SECRET" 2>/dev/null)"
-
-    if [ -z "$SYNO_DEVICE_ID" ]; then
-      _getdeployconf SYNO_DID
-      [ -n "$SYNO_DID" ] || SYNO_DEVICE_ID="$SYNO_DID"
-    fi
-    if [ -n "$SYNO_DEVICE_ID" ]; then
-      _H1="Cookie: did=$SYNO_DEVICE_ID"
-      export _H1
-      _debug3 H1 "${_H1}"
-    fi
-
-    response=$(_post "method=login&account=$encoded_username&passwd=$encoded_password&api=SYNO.API.Auth&version=$api_version&enable_syno_token=yes&otp_code=$DEPRECATED_otp_code&device_name=certrenewal&device_id=$SYNO_DEVICE_ID" "$_base_url/webapi/$api_path?enable_syno_token=yes")
-    _debug3 response "$response"
-  # ## END ## - DEPRECATED, for backward compatibility
-  # If SYNO_DEVICE_ID or SYNO_OTP_CODE is set, we treat current account enabled 2FA-OTP.
-  # Notice that if SYNO_USE_TEMP_ADMIN=1, both variables will be unset
-  else
-    if [ -n "$SYNO_DEVICE_ID" ] || [ -n "$SYNO_OTP_CODE" ]; then
-      response='{"error":{"code":403}}'
-    # Assume the current account disabled 2FA-OTP, try to log in right away.
-    else
-      if [ -n "$SYNO_USE_TEMP_ADMIN" ]; then
-        _getdeployconf SYNO_LOCAL_HOSTNAME
-        _debug SYNO_LOCAL_HOSTNAME "${SYNO_LOCAL_HOSTNAME:-}"
-        if [ "$SYNO_LOCAL_HOSTNAME" != "1" ] && [ "$SYNO_LOCAL_HOSTNAME" == "$SYNO_HOSTNAME" ]; then
-          if [ "$SYNO_HOSTNAME" != "localhost" ] && [ "$SYNO_HOSTNAME" != "127.0.0.1" ]; then
-            _err "SYNO_USE_TEMP_ADMIN=1 only support local deployment, though if you are sure that the hostname $SYNO_HOSTNAME is targeting to your **current local machine**, execute 'export SYNO_LOCAL_HOSTNAME=1' then rerun."
-            return 1
-          fi
-        fi
-        _debug "Creating temp admin user in Synology DSM..."
-        if synogroup --help | grep -q '\-\-memberadd '; then
-          _temp_admin_create "$SYNO_USERNAME" "$SYNO_PASSWORD"
-          synogroup --memberadd administrators "$SYNO_USERNAME" >/dev/null
-        elif synogroup --help | grep -q '\-\-member '; then
-          # For supporting DSM 6.x which only has `--member` parameter.
-          cur_admins=$(synogroup --get administrators | awk -F '[][]' '/Group Members/,0{if(NF>1)printf "%s ", $2}')
-          if [ -n "$cur_admins" ]; then
-            _temp_admin_create "$SYNO_USERNAME" "$SYNO_PASSWORD"
-            _secure_debug3 admin_users "$cur_admins$SYNO_USERNAME"
-            # shellcheck disable=SC2086
-            synogroup --member administrators $cur_admins $SYNO_USERNAME >/dev/null
-          else
-            _err "The tool synogroup may be broken, please set SYNO_USERNAME and SYNO_PASSWORD instead."
-            return 1
-          fi
-        else
-          _err "Unsupported synogroup tool detected, please set SYNO_USERNAME and SYNO_PASSWORD instead."
-          return 1
-        fi
-        # havig a workaround to temporary disable enforce 2FA-OTP, will restore
-        # it soon (after a single request), though if any accident occurs like
-        # unexpected interruption, this setting can be easily reverted manually.
-        otp_enforce_option=$(synogetkeyvalue /etc/synoinfo.conf otp_enforce_option)
-        if [ -n "$otp_enforce_option" ] && [ "${otp_enforce_option:-"none"}" != "none" ]; then
-          synosetkeyvalue /etc/synoinfo.conf otp_enforce_option none
-          _info "Enforcing 2FA-OTP has been disabled to complete temp admin authentication."
-          _info "Notice: it will be restored soon, if not, you can restore it manually via Control Panel."
-          _info "previous_otp_enforce_option" "$otp_enforce_option"
-        else
-          otp_enforce_option=""
-        fi
-      fi
-      response=$(_get "$_base_url/webapi/$api_path?api=SYNO.API.Auth&version=$api_version&method=login&format=sid&account=$encoded_username&passwd=$encoded_password&enable_syno_token=yes")
-      if [ -n "$SYNO_USE_TEMP_ADMIN" ] && [ -n "$otp_enforce_option" ]; then
-        synosetkeyvalue /etc/synoinfo.conf otp_enforce_option "$otp_enforce_option"
-        _info "Restored previous enforce 2FA-OTP option."
-      fi
-      _debug3 response "$response"
-    fi
+  if [ -n "$SYNO_DID" ]; then
+    _H1="Cookie: did=$SYNO_DID"
+    export _H1
+    _debug3 H1 "${_H1}"
   fi
 
-  error_code=$(echo "$response" | grep '"error":' | grep -o '"code":[0-9]*' | grep -o '[0-9]*')
-  _debug2 error_code "$error_code"
-  # Account has 2FA-OTP enabled, since error 403 reported.
-  # https://global.download.synology.com/download/Document/Software/DeveloperGuide/Os/DSM/All/enu/DSM_Login_Web_API_Guide_enu.pdf
-  if [ "$error_code" == "403" ]; then
-    if [ -z "$SYNO_DEVICE_NAME" ]; then
-      printf "Enter device name or leave empty for default (CertRenewal): "
-      read -r SYNO_DEVICE_NAME
-      [ -n "$SYNO_DEVICE_NAME" ] || SYNO_DEVICE_NAME="CertRenewal"
-    fi
-
-    if [ -n "$SYNO_DEVICE_ID" ]; then
-      # Omit OTP code with SYNO_DEVICE_ID.
-      response=$(_get "$_base_url/webapi/$api_path?api=SYNO.API.Auth&version=$api_version&method=login&format=sid&account=$encoded_username&passwd=$encoded_password&enable_syno_token=yes&device_name=$SYNO_DEVICE_NAME&device_id=$SYNO_DEVICE_ID")
-      _secure_debug3 response "$response"
-    else
-      # Require the OTP code if still unset.
-      if [ -z "$SYNO_OTP_CODE" ]; then
-        printf "Enter OTP code for user '%s': " "$SYNO_USERNAME"
-        read -r SYNO_OTP_CODE
-      fi
-      _secure_debug SYNO_OTP_CODE "${SYNO_OTP_CODE:-}"
-
-      if [ -z "$SYNO_OTP_CODE" ]; then
-        response='{"error":{"code":404}}'
-      else
-        response=$(_get "$_base_url/webapi/$api_path?api=SYNO.API.Auth&version=$api_version&method=login&format=sid&account=$encoded_username&passwd=$encoded_password&enable_syno_token=yes&enable_device_token=yes&device_name=$SYNO_DEVICE_NAME&otp_code=$SYNO_OTP_CODE")
-        _secure_debug3 response "$response"
-
-        id_property='device_id'
-        [ "${api_version}" -gt '6' ] || id_property='did'
-        SYNO_DEVICE_ID=$(echo "$response" | grep "$id_property" | sed -n 's/.*"'$id_property'" *: *"\([^"]*\).*/\1/p')
-        _secure_debug2 SYNO_DEVICE_ID "$SYNO_DEVICE_ID"
-      fi
-    fi
-    error_code=$(echo "$response" | grep '"error":' | grep -o '"code":[0-9]*' | grep -o '[0-9]*')
-    _debug2 error_code "$error_code"
-  fi
-
-  if [ -n "$error_code" ]; then
-    if [ "$error_code" == "403" ] && [ -n "$SYNO_DEVICE_ID" ]; then
-      _cleardeployconf SYNO_DEVICE_ID
-      _err "Failed to authenticate with SYNO_DEVICE_ID (may expired or invalid), please try again in a new terminal window."
-    elif [ "$error_code" == "404" ]; then
-      _err "Failed to authenticate with provided 2FA-OTP code, please try again in a new terminal window."
-    elif [ "$error_code" == "406" ]; then
-      if [ -n "$SYNO_USE_TEMP_ADMIN" ]; then
-        _err "Failed with unexcepted error, please report this by providing full log with '--debug 3'."
-      else
-        _err "Enforce auth with 2FA-OTP enabled, please configure the user to enable 2FA-OTP to continue."
-      fi
-    elif [ "$error_code" == "400" ]; then
-      _err "Failed to authenticate, no such account or incorrect password."
-    elif [ "$error_code" == "401" ]; then
-      _err "Failed to authenticate with a non-existent account."
-    elif [ "$error_code" == "408" ] || [ "$error_code" == "409" ] || [ "$error_code" == "410" ]; then
-      _err "Failed to authenticate, the account password has expired or must be changed."
-    else
-      _err "Failed to authenticate with error: $error_code."
-    fi
-    _temp_admin_cleanup "$SYNO_USE_TEMP_ADMIN" "$SYNO_USERNAME"
-    return 1
-  fi
-
-  sid=$(echo "$response" | grep "sid" | sed -n 's/.*"sid" *: *"\([^"]*\).*/\1/p')
+  response=$(_post "method=login&account=$encoded_username&passwd=$encoded_password&api=SYNO.API.Auth&version=$api_version&enable_syno_token=yes" "$_base_url/webapi/auth.cgi?enable_syno_token=yes")
   token=$(echo "$response" | grep "synotoken" | sed -n 's/.*"synotoken" *: *"\([^"]*\).*/\1/p')
-  _debug "Session ID" "$sid"
-  _debug SynoToken "$token"
-  if [ -z "$sid" ] || [ -z "$token" ]; then
-    # Still can't get necessary info even got no errors, may Synology have API updated?
-    _err "Unable to authenticate to $_base_url, you may report this by providing full log with '--debug 3'."
-    _temp_admin_cleanup "$SYNO_USE_TEMP_ADMIN" "$SYNO_USERNAME"
+  _debug3 response "$response"
+  _debug token "$token"
+
+  if [ -z "$token" ]; then
+    _err "Unable to authenticate to $SYNO_Hostname:$SYNO_Port using $SYNO_Scheme."
+    _err "Check your username and password."
     return 1
   fi
+  sid=$(echo "$response" | grep "sid" | sed -n 's/.*"sid" *: *"\([^"]*\).*/\1/p')
 
   _H1="X-SYNO-TOKEN: $token"
   export _H1
   _debug2 H1 "${_H1}"
 
-  # Now that we know the username and password are good, save them if not in temp admin mode.
-  if [ -n "$SYNO_USE_TEMP_ADMIN" ]; then
-    _cleardeployconf SYNO_USERNAME
-    _cleardeployconf SYNO_PASSWORD
-    _cleardeployconf SYNO_DEVICE_ID
-    _cleardeployconf SYNO_DEVICE_NAME
-    _savedeployconf SYNO_USE_TEMP_ADMIN "$SYNO_USE_TEMP_ADMIN"
-    _savedeployconf SYNO_LOCAL_HOSTNAME "$SYNO_HOSTNAME"
-  else
-    _savedeployconf SYNO_USERNAME "$SYNO_USERNAME"
-    _savedeployconf SYNO_PASSWORD "$SYNO_PASSWORD"
-    _savedeployconf SYNO_DEVICE_ID "$SYNO_DEVICE_ID"
-    _savedeployconf SYNO_DEVICE_NAME "$SYNO_DEVICE_NAME"
-  fi
+  # Now that we know the username and password are good, save them
+  _savedeployconf SYNO_Username "$SYNO_Username"
+  _savedeployconf SYNO_Password "$SYNO_Password"
+  _savedeployconf SYNO_DID "$SYNO_DID"
 
-  _info "Getting certificates in Synology DSM..."
+  _info "Getting certificates in Synology DSM"
   response=$(_post "api=SYNO.Core.Certificate.CRT&method=list&version=1&_sid=$sid" "$_base_url/webapi/entry.cgi")
   _debug3 response "$response"
-  escaped_certificate="$(printf "%s" "$SYNO_CERTIFICATE" | sed 's/\([].*^$[]\)/\\\1/g;s/"/\\\\"/g')"
-  _debug escaped_certificate "$escaped_certificate"
-  id=$(echo "$response" | sed -n "s/.*\"desc\":\"$escaped_certificate\",\"id\":\"\([^\"]*\).*/\1/p")
+  id=$(echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\"id\":\"\([^\"]*\).*/\1/p")
   _debug2 id "$id"
 
-  error_code=$(echo "$response" | grep '"error":' | grep -o '"code":[0-9]*' | grep -o '[0-9]*')
-  _debug2 error_code "$error_code"
-  if [ -n "$error_code" ]; then
-    if [ "$error_code" -eq 105 ]; then
-      _err "Current user is not administrator and does not have sufficient permission for deploying."
-    else
-      _err "Failed to fetch certificate info: $error_code, please try again or contact Synology to learn more."
-    fi
-    _temp_admin_cleanup "$SYNO_USE_TEMP_ADMIN" "$SYNO_USERNAME"
+  if [ -z "$id" ] && [ -z "${SYNO_Create:-}" ]; then
+    _err "Unable to find certificate: $SYNO_Certificate and \$SYNO_Create is not set"
     return 1
   fi
 
-  _migratedeployconf SYNO_Create SYNO_CREATE
-  _getdeployconf SYNO_CREATE
-  _debug2 SYNO_CREATE "$SYNO_CREATE"
+  # we've verified this certificate description is a thing, so save it
+  _savedeployconf SYNO_Certificate "$SYNO_Certificate"
 
-  if [ -z "$id" ] && [ -z "$SYNO_CREATE" ]; then
-    _err "Unable to find certificate: $SYNO_CERTIFICATE and $SYNO_CREATE is not set."
-    _temp_admin_cleanup "$SYNO_USE_TEMP_ADMIN" "$SYNO_USERNAME"
-    return 1
+  default=false
+  if echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\([^{]*\).*/\1/p" | grep -- 'is_default":true' >/dev/null; then
+    default=true
   fi
+  _debug2 default "$default"
 
-  # We've verified this certificate description is a thing, so save it
-  _savedeployconf SYNO_CERTIFICATE "$SYNO_CERTIFICATE" "base64"
-
-  _info "Generating form POST request..."
+  _info "Generate form POST request"
   nl="\0015\0012"
   delim="--------------------------$(_utc_date | tr -d -- '-: ')"
   content="--$delim${nl}Content-Disposition: form-data; name=\"key\"; filename=\"$(basename "$_ckey")\"${nl}Content-Type: application/octet-stream${nl}${nl}$(cat "$_ckey")\0012"
   content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"cert\"; filename=\"$(basename "$_ccert")\"${nl}Content-Type: application/octet-stream${nl}${nl}$(cat "$_ccert")\0012"
   content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"inter_cert\"; filename=\"$(basename "$_cca")\"${nl}Content-Type: application/octet-stream${nl}${nl}$(cat "$_cca")\0012"
   content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"id\"${nl}${nl}$id"
-  content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"desc\"${nl}${nl}${SYNO_CERTIFICATE}"
-  if echo "$response" | sed -n "s/.*\"desc\":\"$escaped_certificate\",\([^{]*\).*/\1/p" | grep -- 'is_default":true' >/dev/null; then
-    _debug2 default "This is the default certificate"
-    content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"as_default\"${nl}${nl}true"
-  else
-    _debug2 default "This is NOT the default certificate"
-  fi
+  content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"desc\"${nl}${nl}${SYNO_Certificate}"
+  content="$content${nl}--$delim${nl}Content-Disposition: form-data; name=\"as_default\"${nl}${nl}${default}"
   content="$content${nl}--$delim--${nl}"
   content="$(printf "%b_" "$content")"
   content="${content%_}" # protect trailing \n
 
-  _info "Upload certificate to the Synology DSM."
+  _info "Upload certificate to the Synology DSM"
   response=$(_post "$content" "$_base_url/webapi/entry.cgi?api=SYNO.Core.Certificate&method=import&version=1&SynoToken=$token&_sid=$sid" "" "POST" "multipart/form-data; boundary=${delim}")
   _debug3 response "$response"
 
   if ! echo "$response" | grep '"error":' >/dev/null; then
     if echo "$response" | grep '"restart_httpd":true' >/dev/null; then
-      _info "Restart HTTP services succeeded."
+      _info "http services were restarted"
     else
-      _info "Restart HTTP services failed."
+      _info "http services were NOT restarted"
     fi
-    _temp_admin_cleanup "$SYNO_USE_TEMP_ADMIN" "$SYNO_USERNAME"
-    _logout
     return 0
   else
-    _temp_admin_cleanup "$SYNO_USE_TEMP_ADMIN" "$SYNO_USERNAME"
-    _err "Unable to update certificate, got error response: $response."
-    _logout
+    _err "Unable to update certificate, error code $response"
     return 1
   fi
 }
-
-####################  Private functions below ##################################
-_logout() {
-  # Logout CERT user only to not occupy a permanent session, e.g. in DSM's "Connected Users" widget (based on previous variables)
-  response=$(_get "$_base_url/webapi/$api_path?api=SYNO.API.Auth&version=$api_version&method=logout&_sid=$sid")
-  _debug3 response "$response"
-}
-
-_temp_admin_create() {
-  _username="$1"
-  _password="$2"
-  synouser --del "$_username" >/dev/null 2>/dev/null
-  synouser --add "$_username" "$_password" "" 0 "scruelt@hotmail.com" 0 >/dev/null
-}
-
-_temp_admin_cleanup() {
-  _flag=$1
-  _username=$2
-
-  if [ -n "${_flag}" ]; then
-    _debug "Cleanuping temp admin info..."
-    synouser --del "$_username" >/dev/null
-  fi
-}
-
-#_cleardeployconf   key
-_cleardeployconf() {
-  _cleardomainconf "SAVED_$1"
-}
-
-# key
-_check2cleardeployconfexp() {
-  _key="$1"
-  _clear_key="CLEAR_$_key"
-  # Clear saved settings if explicitly requested
-  if [ -n "$(eval echo \$"$_clear_key")" ]; then
-    _debug2 "$_key: value cleared from config, exported value will be ignored."
-    _cleardeployconf "$_key"
-    eval "$_key"=
-    export "$_key"=
-    eval SAVED_"$_key"=
-    export SAVED_"$_key"=
-  fi
-}

deploy/truenas.sh

@@ -1,223 +0,0 @@
-#!/usr/bin/env sh
-
-# Here is a scipt to deploy the cert to your TrueNAS using the REST API.
-# https://www.truenas.com/docs/hub/additional-topics/api/rest_api.html
-#
-# Written by Frank Plass github@f-plass.de
-# https://github.com/danb35/deploy-freenas/blob/master/deploy_freenas.py
-# Thanks to danb35 for your template!
-#
-# Following environment variables must be set:
-#
-# export DEPLOY_TRUENAS_APIKEY="<API_KEY_GENERATED_IN_THE_WEB_UI"
-#
-# The following environmental variables may be set if you don't like their
-# default values:
-#
-# DEPLOY_TRUENAS_HOSTNAME - defaults to localhost
-# DEPLOY_TRUENAS_SCHEME - defaults to http, set alternatively to https
-#
-#returns 0 means success, otherwise error.
-
-########  Public functions #####################
-
-#domain keyfile certfile cafile fullchain
-truenas_deploy() {
-  _cdomain="$1"
-  _ckey="$2"
-  _ccert="$3"
-  _cca="$4"
-  _cfullchain="$5"
-
-  _debug _cdomain "$_cdomain"
-  _debug _ckey "$_ckey"
-  _debug _ccert "$_ccert"
-  _debug _cca "$_cca"
-  _debug _cfullchain "$_cfullchain"
-
-  _getdeployconf DEPLOY_TRUENAS_APIKEY
-
-  if [ -z "$DEPLOY_TRUENAS_APIKEY" ]; then
-    _err "TrueNAS API key not found, please set the DEPLOY_TRUENAS_APIKEY environment variable."
-    return 1
-  fi
-  _secure_debug2 DEPLOY_TRUENAS_APIKEY "$DEPLOY_TRUENAS_APIKEY"
-
-  # Optional hostname, scheme for TrueNAS
-  _getdeployconf DEPLOY_TRUENAS_HOSTNAME
-  _getdeployconf DEPLOY_TRUENAS_SCHEME
-
-  # default values for hostname and scheme
-  [ -n "${DEPLOY_TRUENAS_HOSTNAME}" ] || DEPLOY_TRUENAS_HOSTNAME="localhost"
-  [ -n "${DEPLOY_TRUENAS_SCHEME}" ] || DEPLOY_TRUENAS_SCHEME="http"
-
-  _debug2 DEPLOY_TRUENAS_HOSTNAME "$DEPLOY_TRUENAS_HOSTNAME"
-  _debug2 DEPLOY_TRUENAS_SCHEME "$DEPLOY_TRUENAS_SCHEME"
-
-  _api_url="$DEPLOY_TRUENAS_SCHEME://$DEPLOY_TRUENAS_HOSTNAME/api/v2.0"
-  _debug _api_url "$_api_url"
-
-  _H1="Authorization: Bearer $DEPLOY_TRUENAS_APIKEY"
-  _secure_debug3 _H1 "$_H1"
-
-  _info "Testing Connection TrueNAS"
-  _response=$(_get "$_api_url/system/state")
-  _info "TrueNAS system state: $_response."
-
-  if [ -z "$_response" ]; then
-    _err "Unable to authenticate to $_api_url."
-    _err 'Check your connection settings are correct, e.g.'
-    _err 'DEPLOY_TRUENAS_HOSTNAME="192.168.x.y" or DEPLOY_TRUENAS_HOSTNAME="truenas.example.com".'
-    _err 'DEPLOY_TRUENAS_SCHEME="https" or DEPLOY_TRUENAS_SCHEME="http".'
-    _err "Verify your TrueNAS API key is valid and set correctly, e.g. DEPLOY_TRUENAS_APIKEY=xxxx...."
-    return 1
-  fi
-
-  _savedeployconf DEPLOY_TRUENAS_APIKEY "$DEPLOY_TRUENAS_APIKEY"
-  _savedeployconf DEPLOY_TRUENAS_HOSTNAME "$DEPLOY_TRUENAS_HOSTNAME"
-  _savedeployconf DEPLOY_TRUENAS_SCHEME "$DEPLOY_TRUENAS_SCHEME"
-
-  _info "Getting current active certificate from TrueNAS"
-  _response=$(_get "$_api_url/system/general")
-  _active_cert_id=$(echo "$_response" | grep -B2 '"name":' | grep 'id' | tr -d -- '"id: ,')
-  _active_cert_name=$(echo "$_response" | grep '"name":' | sed -n 's/.*: "\(.\{1,\}\)",$/\1/p')
-  _param_httpsredirect=$(echo "$_response" | grep '"ui_httpsredirect":' | sed -n 's/.*": \(.\{1,\}\),$/\1/p')
-  _debug Active_UI_Certificate_ID "$_active_cert_id"
-  _debug Active_UI_Certificate_Name "$_active_cert_name"
-  _debug Active_UI_http_redirect "$_param_httpsredirect"
-
-  if [ "$DEPLOY_TRUENAS_SCHEME" = "http" ] && [ "$_param_httpsredirect" = "true" ]; then
-    _info "HTTP->HTTPS redirection is enabled"
-    _info "Setting DEPLOY_TRUENAS_SCHEME to 'https'"
-    DEPLOY_TRUENAS_SCHEME="https"
-    _api_url="$DEPLOY_TRUENAS_SCHEME://$DEPLOY_TRUENAS_HOSTNAME/api/v2.0"
-    _savedeployconf DEPLOY_TRUENAS_SCHEME "$DEPLOY_TRUENAS_SCHEME"
-  fi
-
-  _info "Uploading new certificate to TrueNAS"
-  _certname="Letsencrypt_$(_utc_date | tr ' ' '_' | tr -d -- ':')"
-  _debug3 _certname "$_certname"
-
-  _certData="{\"create_type\": \"CERTIFICATE_CREATE_IMPORTED\", \"name\": \"${_certname}\", \"certificate\": \"$(_json_encode <"$_cfullchain")\", \"privatekey\": \"$(_json_encode <"$_ckey")\"}"
-  _add_cert_result="$(_post "$_certData" "$_api_url/certificate" "" "POST" "application/json")"
-
-  _debug3 _add_cert_result "$_add_cert_result"
-
-  _info "Fetching list of installed certificates"
-  _cert_list=$(_get "$_api_url/system/general/ui_certificate_choices")
-  _cert_id=$(echo "$_cert_list" | grep "$_certname" | sed -n 's/.*"\([0-9]\{1,\}\)".*$/\1/p')
-
-  _debug3 _cert_id "$_cert_id"
-
-  _info "Current activate certificate ID: $_cert_id"
-  _activateData="{\"ui_certificate\": \"${_cert_id}\"}"
-  _activate_result="$(_post "$_activateData" "$_api_url/system/general" "" "PUT" "application/json")"
-
-  _debug3 _activate_result "$_activate_result"
-
-  _info "Checking if WebDAV certificate is the same as the TrueNAS web UI"
-  _webdav_list=$(_get "$_api_url/webdav")
-  _webdav_cert_id=$(echo "$_webdav_list" | grep '"certssl":' | tr -d -- '"certsl: ,')
-
-  if [ "$_webdav_cert_id" = "$_active_cert_id" ]; then
-    _info "Updating the WebDAV certificate"
-    _debug _webdav_cert_id "$_webdav_cert_id"
-    _webdav_data="{\"certssl\": \"${_cert_id}\"}"
-    _activate_webdav_cert="$(_post "$_webdav_data" "$_api_url/webdav" "" "PUT" "application/json")"
-    _webdav_new_cert_id=$(echo "$_activate_webdav_cert" | _json_decode | grep '"certssl":' | sed -n 's/.*: \([0-9]\{1,\}\),\{0,1\}$/\1/p')
-    if [ "$_webdav_new_cert_id" -eq "$_cert_id" ]; then
-      _info "WebDAV certificate updated successfully"
-    else
-      _err "Unable to set WebDAV certificate"
-      _debug3 _activate_webdav_cert "$_activate_webdav_cert"
-      _debug3 _webdav_new_cert_id "$_webdav_new_cert_id"
-      return 1
-    fi
-    _debug3 _webdav_new_cert_id "$_webdav_new_cert_id"
-  else
-    _info "WebDAV certificate is not configured or is not the same as TrueNAS web UI"
-  fi
-
-  _info "Checking if FTP certificate is the same as the TrueNAS web UI"
-  _ftp_list=$(_get "$_api_url/ftp")
-  _ftp_cert_id=$(echo "$_ftp_list" | grep '"ssltls_certificate":' | tr -d -- '"certislfa:_ ,')
-
-  if [ "$_ftp_cert_id" = "$_active_cert_id" ]; then
-    _info "Updating the FTP certificate"
-    _debug _ftp_cert_id "$_ftp_cert_id"
-    _ftp_data="{\"ssltls_certificate\": \"${_cert_id}\"}"
-    _activate_ftp_cert="$(_post "$_ftp_data" "$_api_url/ftp" "" "PUT" "application/json")"
-    _ftp_new_cert_id=$(echo "$_activate_ftp_cert" | _json_decode | grep '"ssltls_certificate":' | sed -n 's/.*: \([0-9]\{1,\}\),\{0,1\}$/\1/p')
-    if [ "$_ftp_new_cert_id" -eq "$_cert_id" ]; then
-      _info "FTP certificate updated successfully"
-    else
-      _err "Unable to set FTP certificate"
-      _debug3 _activate_ftp_cert "$_activate_ftp_cert"
-      _debug3 _ftp_new_cert_id "$_ftp_new_cert_id"
-      return 1
-    fi
-    _debug3 _activate_ftp_cert "$_activate_ftp_cert"
-  else
-    _info "FTP certificate is not configured or is not the same as TrueNAS web UI"
-  fi
-
-  _info "Checking if S3 certificate is the same as the TrueNAS web UI"
-  _s3_list=$(_get "$_api_url/s3")
-  _s3_cert_id=$(echo "$_s3_list" | grep '"certificate":' | tr -d -- '"certifa:_ ,')
-
-  if [ "$_s3_cert_id" = "$_active_cert_id" ]; then
-    _info "Updating the S3 certificate"
-    _debug _s3_cert_id "$_s3_cert_id"
-    _s3_data="{\"certificate\": \"${_cert_id}\"}"
-    _activate_s3_cert="$(_post "$_s3_data" "$_api_url/s3" "" "PUT" "application/json")"
-    _s3_new_cert_id=$(echo "$_activate_s3_cert" | _json_decode | grep '"certificate":' | sed -n 's/.*: \([0-9]\{1,\}\),\{0,1\}$/\1/p')
-    if [ "$_s3_new_cert_id" -eq "$_cert_id" ]; then
-      _info "S3 certificate updated successfully"
-    else
-      _err "Unable to set S3 certificate"
-      _debug3 _activate_s3_cert "$_activate_s3_cert"
-      _debug3 _s3_new_cert_id "$_s3_new_cert_id"
-      return 1
-    fi
-    _debug3 _activate_s3_cert "$_activate_s3_cert"
-  else
-    _info "S3 certificate is not configured or is not the same as TrueNAS web UI"
-  fi
-
-  _info "Checking if any chart release Apps is using the same certificate as TrueNAS web UI. Tool 'jq' is required"
-  if _exists jq; then
-    _info "Query all chart release"
-    _release_list=$(_get "$_api_url/chart/release")
-    _related_name_list=$(printf "%s" "$_release_list" | jq -r "[.[] | {name,certId: .config.ingress?.main.tls[]?.scaleCert} | select(.certId==$_active_cert_id) | .name ] | unique")
-    _release_length=$(printf "%s" "$_related_name_list" | jq -r "length")
-    _info "Found $_release_length related chart release in list: $_related_name_list"
-    for i in $(seq 0 $((_release_length - 1))); do
-      _release_name=$(echo "$_related_name_list" | jq -r ".[$i]")
-      _info "Updating certificate from $_active_cert_id to $_cert_id for chart release: $_release_name"
-      #Read the chart release configuration
-      _chart_config=$(printf "%s" "$_release_list" | jq -r ".[] | select(.name==\"$_release_name\")")
-      #Replace the old certificate id with the new one in path .config.ingress.main.tls[].scaleCert. Then update .config.ingress
-      _updated_chart_config=$(printf "%s" "$_chart_config" | jq "(.config.ingress?.main.tls[]? | select(.scaleCert==$_active_cert_id) | .scaleCert  ) |= $_cert_id | .config.ingress ")
-      _update_chart_result="$(_post "{\"values\" : { \"ingress\" : $_updated_chart_config } }" "$_api_url/chart/release/id/$_release_name" "" "PUT" "application/json")"
-      _debug3 _update_chart_result "$_update_chart_result"
-    done
-  else
-    _info "Tool 'jq' does not exists, skip chart release checking"
-  fi
-
-  _info "Deleting old certificate"
-  _delete_result="$(_post "" "$_api_url/certificate/id/$_active_cert_id" "" "DELETE" "application/json")"
-
-  _debug3 _delete_result "$_delete_result"
-
-  _info "Reloading TrueNAS web UI"
-  _restart_UI=$(_get "$_api_url/system/general/ui_restart")
-  _debug2 _restart_UI "$_restart_UI"
-
-  if [ -n "$_add_cert_result" ] && [ -n "$_activate_result" ]; then
-    return 0
-  else
-    _err "Certificate update was not succesful, please try again with --debug"
-    return 1
-  fi
-}

deploy/unifi.sh

@@ -1,52 +1,12 @@
 #!/usr/bin/env sh
 
-# Here is a script to deploy cert on a Unifi Controller or Cloud Key device.
-# It supports:
-#   - self-hosted Unifi Controller
-#   - Unifi Cloud Key (Gen1/2/2+)
-#   - Unifi Cloud Key running UnifiOS (v2.0.0+, Gen2/2+ only)
-#   - Unifi Dream Machine
-#       This has not been tested on other "all-in-one" devices such as
-#       UDM Pro or Unifi Express.
-#
-#       OS Version v2.0.0+
-#       Network Application version 7.0.0+
-#       OS version ~3.1 removed java and keytool from the UnifiOS.
-#       Using PKCS12 format keystore appears to work fine.
-#
-# Please report bugs to https://github.com/acmesh-official/acme.sh/issues/3359
+#Here is a script to deploy cert to unifi server.
 
 #returns 0 means success, otherwise error.
 
-# The deploy-hook automatically detects standard Unifi installations
-# for each of the supported environments. Most users should not need
-# to set any of these variables, but if you are running a self-hosted
-# Controller with custom locations, set these as necessary before running
-# the deploy hook. (Defaults shown below.)
-#
-# Settings for Unifi Controller:
-# Location of Java keystore or unifi.keystore.jks file:
 #DEPLOY_UNIFI_KEYSTORE="/usr/lib/unifi/data/keystore"
-# Keystore password (built into Unifi Controller, not a user-set password):
 #DEPLOY_UNIFI_KEYPASS="aircontrolenterprise"
-# Command to restart Unifi Controller:
 #DEPLOY_UNIFI_RELOAD="service unifi restart"
-#
-# Settings for Unifi Cloud Key Gen1 (nginx admin pages):
-# Directory where cloudkey.crt and cloudkey.key live:
-#DEPLOY_UNIFI_CLOUDKEY_CERTDIR="/etc/ssl/private"
-# Command to restart maintenance pages and Controller
-# (same setting as above, default is updated when running on Cloud Key Gen1):
-#DEPLOY_UNIFI_RELOAD="service nginx restart && service unifi restart"
-#
-# Settings for UnifiOS (Cloud Key Gen2):
-# Directory where unifi-core.crt and unifi-core.key live:
-#DEPLOY_UNIFI_CORE_CONFIG="/data/unifi-core/config/"
-# Command to restart unifi-core:
-#DEPLOY_UNIFI_RELOAD="systemctl restart unifi-core"
-#
-# At least one of DEPLOY_UNIFI_KEYSTORE, DEPLOY_UNIFI_CLOUDKEY_CERTDIR,
-# or DEPLOY_UNIFI_CORE_CONFIG must exist to receive the deployed certs.
 
 ########  Public functions #####################
 
@@ -64,203 +24,77 @@ unifi_deploy() {
   _debug _cca "$_cca"
   _debug _cfullchain "$_cfullchain"
 
-  _getdeployconf DEPLOY_UNIFI_KEYSTORE
-  _getdeployconf DEPLOY_UNIFI_KEYPASS
-  _getdeployconf DEPLOY_UNIFI_CLOUDKEY_CERTDIR
-  _getdeployconf DEPLOY_UNIFI_CORE_CONFIG
-  _getdeployconf DEPLOY_UNIFI_RELOAD
+  if ! _exists keytool; then
+    _err "keytool not found"
+    return 1
+  fi
 
-  _debug2 DEPLOY_UNIFI_KEYSTORE "$DEPLOY_UNIFI_KEYSTORE"
-  _debug2 DEPLOY_UNIFI_KEYPASS "$DEPLOY_UNIFI_KEYPASS"
-  _debug2 DEPLOY_UNIFI_CLOUDKEY_CERTDIR "$DEPLOY_UNIFI_CLOUDKEY_CERTDIR"
-  _debug2 DEPLOY_UNIFI_CORE_CONFIG "$DEPLOY_UNIFI_CORE_CONFIG"
-  _debug2 DEPLOY_UNIFI_RELOAD "$DEPLOY_UNIFI_RELOAD"
+  DEFAULT_UNIFI_KEYSTORE="/usr/lib/unifi/data/keystore"
+  _unifi_keystore="${DEPLOY_UNIFI_KEYSTORE:-$DEFAULT_UNIFI_KEYSTORE}"
+  DEFAULT_UNIFI_KEYPASS="aircontrolenterprise"
+  _unifi_keypass="${DEPLOY_UNIFI_KEYPASS:-$DEFAULT_UNIFI_KEYPASS}"
+  DEFAULT_UNIFI_RELOAD="service unifi restart"
+  _reload="${DEPLOY_UNIFI_RELOAD:-$DEFAULT_UNIFI_RELOAD}"
 
-  # Space-separated list of environments detected and installed:
-  _services_updated=""
-
-  # Default reload commands accumulated as we auto-detect environments:
-  _reload_cmd=""
-
-  # Unifi Controller environment (self hosted or any Cloud Key) --
-  # auto-detect by file /usr/lib/unifi/data/keystore
-  _unifi_keystore="${DEPLOY_UNIFI_KEYSTORE:-/usr/lib/unifi/data/keystore}"
-  if [ -f "$_unifi_keystore" ]; then
-    _debug _unifi_keystore "$_unifi_keystore"
-    if ! _exists keytool; then
-      _do_keytool=0
-      _info "Installing certificate for Unifi Controller (PKCS12 keystore)."
+  _debug _unifi_keystore "$_unifi_keystore"
+  if [ ! -f "$_unifi_keystore" ]; then
+    if [ -z "$DEPLOY_UNIFI_KEYSTORE" ]; then
+      _err "unifi keystore is not found, please define DEPLOY_UNIFI_KEYSTORE"
+      return 1
     else
-      _do_keytool=1
-      _info "Installing certificate for Unifi Controller (Java keystore)"
-    fi
-    if [ ! -w "$_unifi_keystore" ]; then
-      _err "The file $_unifi_keystore is not writable, please change the permission."
+      _err "It seems that the specified unifi keystore is not valid, please check."
       return 1
     fi
+  fi
+  if [ ! -w "$_unifi_keystore" ]; then
+    _err "The file $_unifi_keystore is not writable, please change the permission."
+    return 1
+  fi
 
-    _unifi_keypass="${DEPLOY_UNIFI_KEYPASS:-aircontrolenterprise}"
-
-    _debug "Generate import pkcs12"
-    _import_pkcs12="$(_mktemp)"
-    _debug "_toPkcs $_import_pkcs12 $_ckey $_ccert $_cca $_unifi_keypass unifi root"
-    _toPkcs "$_import_pkcs12" "$_ckey" "$_ccert" "$_cca" "$_unifi_keypass" unifi root
-    # shellcheck disable=SC2181
-    if [ "$?" != "0" ]; then
-      _err "Error generating pkcs12. Please re-run with --debug and report a bug."
-      return 1
-    fi
-
-    # Save the existing keystore in case something goes wrong.
-    mv -f "${_unifi_keystore}" "${_unifi_keystore}"_original
-    _info "Previous keystore saved to ${_unifi_keystore}_original."
-
-    if [ "$_do_keytool" -eq 1 ]; then
-      _debug "Import into keystore: $_unifi_keystore"
-      if keytool -importkeystore \
-        -deststorepass "$_unifi_keypass" -destkeypass "$_unifi_keypass" -destkeystore "$_unifi_keystore" \
-        -srckeystore "$_import_pkcs12" -srcstoretype PKCS12 -srcstorepass "$_unifi_keypass" \
-        -alias unifi -noprompt; then
-        _debug "Import keystore success!"
-      else
-        _err "Error importing into Unifi Java keystore."
-        _err "Please re-run with --debug and report a bug."
-        _info "Restoring original keystore."
-        mv -f "${_unifi_keystore}"_original "${_unifi_keystore}"
-        rm "$_import_pkcs12"
-        return 1
-      fi
-    else
-      _debug "Copying new keystore to $_unifi_keystore"
-      cp -f "$_import_pkcs12" "$_unifi_keystore"
-    fi
-
-    # Update unifi service for certificate cipher compatibility
-    if ${ACME_OPENSSL_BIN:-openssl} pkcs12 \
-      -in "$_import_pkcs12" \
-      -password pass:aircontrolenterprise \
-      -nokeys | ${ACME_OPENSSL_BIN:-openssl} x509 -text \
-      -noout | grep -i "signature" | grep -iq ecdsa >/dev/null 2>&1; then
-      cp -f /usr/lib/unifi/data/system.properties /usr/lib/unifi/data/system.properties_original
-      _info "Updating system configuration for cipher compatibility."
-      _info "Saved original system config to /usr/lib/unifi/data/system.properties_original"
-      sed -i '/unifi\.https\.ciphers/d' /usr/lib/unifi/data/system.properties
-      echo "unifi.https.ciphers=ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES128-GCM-SHA256" >>/usr/lib/unifi/data/system.properties
-      sed -i '/unifi\.https\.sslEnabledProtocols/d' /usr/lib/unifi/data/system.properties
-      echo "unifi.https.sslEnabledProtocols=TLSv1.3,TLSv1.2" >>/usr/lib/unifi/data/system.properties
-      _info "System configuration updated."
-    fi
+  _info "Generate import pkcs12"
+  _import_pkcs12="$(_mktemp)"
+  _toPkcs "$_import_pkcs12" "$_ckey" "$_ccert" "$_cca" "$_unifi_keypass" unifi root
+  if [ "$?" != "0" ]; then
+    _err "Oops, error creating import pkcs12, please report bug to us."
+    return 1
+  fi
 
+  _info "Modify unifi keystore: $_unifi_keystore"
+  if keytool -importkeystore \
+    -deststorepass "$_unifi_keypass" -destkeypass "$_unifi_keypass" -destkeystore "$_unifi_keystore" \
+    -srckeystore "$_import_pkcs12" -srcstoretype PKCS12 -srcstorepass "$_unifi_keypass" \
+    -alias unifi -noprompt; then
+    _info "Import keystore success!"
+    rm "$_import_pkcs12"
+  else
+    _err "Import unifi keystore error, please report bug to us."
     rm "$_import_pkcs12"
-
-    # Restarting unifi-core will bring up unifi, doing it out of order results in
-    # a certificate error, and breaks wifiman.
-    # Restart if we aren't doing unifi-core, otherwise stop for later restart.
-    if systemctl -q is-active unifi; then
-      if [ ! -f "${DEPLOY_UNIFI_CORE_CONFIG:-/data/unifi-core/config}/unifi-core.key" ]; then
-        _reload_cmd="${_reload_cmd:+$_reload_cmd && }systemctl restart unifi"
-      else
-        _reload_cmd="${_reload_cmd:+$_reload_cmd && }systemctl stop unifi"
-      fi
-    fi
-    _services_updated="${_services_updated} unifi"
-    _info "Install Unifi Controller certificate success!"
-  elif [ "$DEPLOY_UNIFI_KEYSTORE" ]; then
-    _err "The specified DEPLOY_UNIFI_KEYSTORE='$DEPLOY_UNIFI_KEYSTORE' is not valid, please check."
     return 1
   fi
 
-  # Cloud Key environment (non-UnifiOS -- nginx serves admin pages) --
-  # auto-detect by file /etc/ssl/private/cloudkey.key:
-  _cloudkey_certdir="${DEPLOY_UNIFI_CLOUDKEY_CERTDIR:-/etc/ssl/private}"
-  if [ -f "${_cloudkey_certdir}/cloudkey.key" ]; then
-    _info "Installing certificate for Cloud Key Gen1 (nginx admin pages)"
-    _debug _cloudkey_certdir "$_cloudkey_certdir"
-    if [ ! -w "$_cloudkey_certdir" ]; then
-      _err "The directory $_cloudkey_certdir is not writable; please check permissions."
-      return 1
-    fi
-    # Cloud Key expects to load the keystore from /etc/ssl/private/unifi.keystore.jks.
-    # Normally /usr/lib/unifi/data/keystore is a symlink there (so the keystore was
-    # updated above), but if not, we don't know how to handle this installation:
-    if ! cmp -s "$_unifi_keystore" "${_cloudkey_certdir}/unifi.keystore.jks"; then
-      _err "Unsupported Cloud Key configuration: keystore not found at '${_cloudkey_certdir}/unifi.keystore.jks'"
-      return 1
-    fi
-
-    cat "$_cfullchain" >"${_cloudkey_certdir}/cloudkey.crt"
-    cat "$_ckey" >"${_cloudkey_certdir}/cloudkey.key"
-    (cd "$_cloudkey_certdir" && tar -cf cert.tar cloudkey.crt cloudkey.key unifi.keystore.jks)
-
-    if systemctl -q is-active nginx; then
-      _reload_cmd="${_reload_cmd:+$_reload_cmd && }service nginx restart"
-    fi
-    _info "Install Cloud Key Gen1 certificate success!"
-    _services_updated="${_services_updated} nginx"
-  elif [ "$DEPLOY_UNIFI_CLOUDKEY_CERTDIR" ]; then
-    _err "The specified DEPLOY_UNIFI_CLOUDKEY_CERTDIR='$DEPLOY_UNIFI_CLOUDKEY_CERTDIR' is not valid, please check."
-    return 1
-  fi
-
-  # UnifiOS environment -- auto-detect by /data/unifi-core/config/unifi-core.key:
-  _unifi_core_config="${DEPLOY_UNIFI_CORE_CONFIG:-/data/unifi-core/config}"
-  if [ -f "${_unifi_core_config}/unifi-core.key" ]; then
-    _info "Installing certificate for UnifiOS"
-    _debug _unifi_core_config "$_unifi_core_config"
-    if [ ! -w "$_unifi_core_config" ]; then
-      _err "The directory $_unifi_core_config is not writable; please check permissions."
-      return 1
-    fi
-
-    # Save the existing certs in case something goes wrong.
-    cp -f "${_unifi_core_config}"/unifi-core.crt "${_unifi_core_config}"/unifi-core_original.crt
-    cp -f "${_unifi_core_config}"/unifi-core.key "${_unifi_core_config}"/unifi-core_original.key
-    _info "Previous certificate and key saved to ${_unifi_core_config}/unifi-core_original.crt/key."
-
-    cat "$_cfullchain" >"${_unifi_core_config}/unifi-core.crt"
-    cat "$_ckey" >"${_unifi_core_config}/unifi-core.key"
-
-    if systemctl -q is-active unifi-core; then
-      _reload_cmd="${_reload_cmd:+$_reload_cmd && }systemctl restart unifi-core"
-    fi
-    _info "Install UnifiOS certificate success!"
-    _services_updated="${_services_updated} unifi-core"
-  elif [ "$DEPLOY_UNIFI_CORE_CONFIG" ]; then
-    _err "The specified DEPLOY_UNIFI_CORE_CONFIG='$DEPLOY_UNIFI_CORE_CONFIG' is not valid, please check."
-    return 1
-  fi
-
-  if [ -z "$_services_updated" ]; then
-    # None of the Unifi environments were auto-detected, so no deployment has occurred
-    # (and none of DEPLOY_UNIFI_{KEYSTORE,CLOUDKEY_CERTDIR,CORE_CONFIG} were set).
-    _err "Unable to detect Unifi environment in standard location."
-    _err "(This deploy hook must be run on the Unifi device, not a remote machine.)"
-    _err "For non-standard Unifi installations, set DEPLOY_UNIFI_KEYSTORE,"
-    _err "DEPLOY_UNIFI_CLOUDKEY_CERTDIR, and/or DEPLOY_UNIFI_CORE_CONFIG as appropriate."
-    return 1
-  fi
-
-  _reload_cmd="${DEPLOY_UNIFI_RELOAD:-$_reload_cmd}"
-  if [ -z "$_reload_cmd" ]; then
-    _err "Certificates were installed for services:${_services_updated},"
-    _err "but none appear to be active. Please set DEPLOY_UNIFI_RELOAD"
-    _err "to a command that will restart the necessary services."
-    return 1
-  fi
-  _info "Reload services (this may take some time): $_reload_cmd"
-  if eval "$_reload_cmd"; then
+  _info "Run reload: $_reload"
+  if eval "$_reload"; then
     _info "Reload success!"
+    if [ "$DEPLOY_UNIFI_KEYSTORE" ]; then
+      _savedomainconf DEPLOY_UNIFI_KEYSTORE "$DEPLOY_UNIFI_KEYSTORE"
+    else
+      _cleardomainconf DEPLOY_UNIFI_KEYSTORE
+    fi
+    if [ "$DEPLOY_UNIFI_KEYPASS" ]; then
+      _savedomainconf DEPLOY_UNIFI_KEYPASS "$DEPLOY_UNIFI_KEYPASS"
+    else
+      _cleardomainconf DEPLOY_UNIFI_KEYPASS
+    fi
+    if [ "$DEPLOY_UNIFI_RELOAD" ]; then
+      _savedomainconf DEPLOY_UNIFI_RELOAD "$DEPLOY_UNIFI_RELOAD"
+    else
+      _cleardomainconf DEPLOY_UNIFI_RELOAD
+    fi
+    return 0
   else
     _err "Reload error"
     return 1
   fi
-
-  # Successful, so save all (non-default) config:
-  _savedeployconf DEPLOY_UNIFI_KEYSTORE "$DEPLOY_UNIFI_KEYSTORE"
-  _savedeployconf DEPLOY_UNIFI_KEYPASS "$DEPLOY_UNIFI_KEYPASS"
-  _savedeployconf DEPLOY_UNIFI_CLOUDKEY_CERTDIR "$DEPLOY_UNIFI_CLOUDKEY_CERTDIR"
-  _savedeployconf DEPLOY_UNIFI_CORE_CONFIG "$DEPLOY_UNIFI_CORE_CONFIG"
-  _savedeployconf DEPLOY_UNIFI_RELOAD "$DEPLOY_UNIFI_RELOAD"
-
   return 0
+
 }

deploy/vault.sh

@@ -7,16 +7,13 @@
 #
 # VAULT_PREFIX - this contains the prefix path in vault
 # VAULT_ADDR - vault requires this to find your vault server
-# VAULT_SAVE_TOKEN - set to anything if you want to save the token
-# VAULT_RENEW_TOKEN - set to anything if you want to renew the token to default TTL before deploying
-# VAULT_KV_V2 - set to anything if you are using v2 of the kv engine
 #
 # additionally, you need to ensure that VAULT_TOKEN is avialable
 # to access the vault server
 
 #returns 0 means success, otherwise error.
 
-######## Public functions #####################
+########  Public functions #####################
 
 #domain keyfile certfile cafile fullchain
 vault_deploy() {
@@ -48,84 +45,23 @@ vault_deploy() {
   fi
   _savedeployconf VAULT_ADDR "$VAULT_ADDR"
 
-  _getdeployconf VAULT_SAVE_TOKEN
-  _savedeployconf VAULT_SAVE_TOKEN "$VAULT_SAVE_TOKEN"
-
-  _getdeployconf VAULT_RENEW_TOKEN
-  _savedeployconf VAULT_RENEW_TOKEN "$VAULT_RENEW_TOKEN"
-
-  _getdeployconf VAULT_KV_V2
-  _savedeployconf VAULT_KV_V2 "$VAULT_KV_V2"
-
-  _getdeployconf VAULT_TOKEN
-  if [ -z "$VAULT_TOKEN" ]; then
-    _err "VAULT_TOKEN needs to be defined"
-    return 1
-  fi
-  if [ -n "$VAULT_SAVE_TOKEN" ]; then
-    _savedeployconf VAULT_TOKEN "$VAULT_TOKEN"
-  fi
-
-  _migratedeployconf FABIO VAULT_FABIO_MODE
-
   # JSON does not allow multiline strings.
   # So replacing new-lines with "\n" here
-  _ckey=$(sed -e ':a' -e N -e '$ ! ba' -e 's/\n/\\n/g' <"$2")
-  _ccert=$(sed -e ':a' -e N -e '$ ! ba' -e 's/\n/\\n/g' <"$3")
-  _cca=$(sed -e ':a' -e N -e '$ ! ba' -e 's/\n/\\n/g' <"$4")
-  _cfullchain=$(sed -e ':a' -e N -e '$ ! ba' -e 's/\n/\\n/g' <"$5")
-
-  export _H1="X-Vault-Token: $VAULT_TOKEN"
-
-  if [ -n "$VAULT_RENEW_TOKEN" ]; then
-    URL="$VAULT_ADDR/v1/auth/token/renew-self"
-    _info "Renew the Vault token to default TTL"
-    if ! _post "" "$URL" >/dev/null; then
-      _err "Failed to renew the Vault token"
-      return 1
-    fi
-  fi
+  _ckey=$(sed -z 's/\n/\\n/g' <"$2")
+  _ccert=$(sed -z 's/\n/\\n/g' <"$3")
+  _cca=$(sed -z 's/\n/\\n/g' <"$4")
+  _cfullchain=$(sed -z 's/\n/\\n/g' <"$5")
 
   URL="$VAULT_ADDR/v1/$VAULT_PREFIX/$_cdomain"
+  export _H1="X-Vault-Token: $VAULT_TOKEN"
 
-  if [ -n "$VAULT_FABIO_MODE" ]; then
-    _info "Writing certificate and key to $URL in Fabio mode"
-    if [ -n "$VAULT_KV_V2" ]; then
-      _post "{ \"data\": {\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"} }" "$URL" >/dev/null || return 1
-    else
-      _post "{\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"}" "$URL" >/dev/null || return 1
-    fi
+  if [ -n "$FABIO" ]; then
+    _post "{\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"}" "$URL"
   else
-    if [ -n "$VAULT_KV_V2" ]; then
-      _info "Writing certificate to $URL/cert.pem"
-      _post "{\"data\": {\"value\": \"$_ccert\"}}" "$URL/cert.pem" >/dev/null || return 1
-      _info "Writing key to $URL/cert.key"
-      _post "{\"data\": {\"value\": \"$_ckey\"}}" "$URL/cert.key" >/dev/null || return 1
-      _info "Writing CA certificate to $URL/ca.pem"
-      _post "{\"data\": {\"value\": \"$_cca\"}}" "$URL/ca.pem" >/dev/null || return 1
-      _info "Writing full-chain certificate to $URL/fullchain.pem"
-      _post "{\"data\": {\"value\": \"$_cfullchain\"}}" "$URL/fullchain.pem" >/dev/null || return 1
-    else
-      _info "Writing certificate to $URL/cert.pem"
-      _post "{\"value\": \"$_ccert\"}" "$URL/cert.pem" >/dev/null || return 1
-      _info "Writing key to $URL/cert.key"
-      _post "{\"value\": \"$_ckey\"}" "$URL/cert.key" >/dev/null || return 1
-      _info "Writing CA certificate to $URL/ca.pem"
-      _post "{\"value\": \"$_cca\"}" "$URL/ca.pem" >/dev/null || return 1
-      _info "Writing full-chain certificate to $URL/fullchain.pem"
-      _post "{\"value\": \"$_cfullchain\"}" "$URL/fullchain.pem" >/dev/null || return 1
-    fi
-
-    # To make it compatible with the wrong ca path `chain.pem` which was used in former versions
-    if _contains "$(_get "$URL/chain.pem")" "-----BEGIN CERTIFICATE-----"; then
-      _err "The CA certificate has moved from chain.pem to ca.pem, if you don't depend on chain.pem anymore, you can delete it to avoid this warning"
-      _info "Updating CA certificate to $URL/chain.pem for backward compatibility"
-      if [ -n "$VAULT_KV_V2" ]; then
-        _post "{\"data\": {\"value\": \"$_cca\"}}" "$URL/chain.pem" >/dev/null || return 1
-      else
-        _post "{\"value\": \"$_cca\"}" "$URL/chain.pem" >/dev/null || return 1
-      fi
-    fi
+    _post "{\"value\": \"$_ccert\"}" "$URL/cert.pem"
+    _post "{\"value\": \"$_ckey\"}" "$URL/cert.key"
+    _post "{\"value\": \"$_cca\"}" "$URL/chain.pem"
+    _post "{\"value\": \"$_cfullchain\"}" "$URL/fullchain.pem"
   fi
 
 }

deploy/vault_cli.sh

@@ -8,8 +8,6 @@
 #
 # VAULT_PREFIX - this contains the prefix path in vault
 # VAULT_ADDR - vault requires this to find your vault server
-# VAULT_SAVE_TOKEN - set to anything if you want to save the token
-# VAULT_RENEW_TOKEN - set to anything if you want to renew the token to default TTL before deploying
 #
 # additionally, you need to ensure that VAULT_TOKEN is avialable or
 # `vault auth` has applied the appropriate authorization for the vault binary
@@ -35,36 +33,15 @@ vault_cli_deploy() {
   _debug _cfullchain "$_cfullchain"
 
   # validate required env vars
-  _getdeployconf VAULT_PREFIX
   if [ -z "$VAULT_PREFIX" ]; then
     _err "VAULT_PREFIX needs to be defined (contains prefix path in vault)"
     return 1
   fi
-  _savedeployconf VAULT_PREFIX "$VAULT_PREFIX"
 
-  _getdeployconf VAULT_ADDR
   if [ -z "$VAULT_ADDR" ]; then
     _err "VAULT_ADDR needs to be defined (contains vault connection address)"
     return 1
   fi
-  _savedeployconf VAULT_ADDR "$VAULT_ADDR"
-
-  _getdeployconf VAULT_SAVE_TOKEN
-  _savedeployconf VAULT_SAVE_TOKEN "$VAULT_SAVE_TOKEN"
-
-  _getdeployconf VAULT_RENEW_TOKEN
-  _savedeployconf VAULT_RENEW_TOKEN "$VAULT_RENEW_TOKEN"
-
-  _getdeployconf VAULT_TOKEN
-  if [ -z "$VAULT_TOKEN" ]; then
-    _err "VAULT_TOKEN needs to be defined"
-    return 1
-  fi
-  if [ -n "$VAULT_SAVE_TOKEN" ]; then
-    _savedeployconf VAULT_TOKEN "$VAULT_TOKEN"
-  fi
-
-  _migratedeployconf FABIO VAULT_FABIO_MODE
 
   VAULT_CMD=$(command -v vault)
   if [ ! $? ]; then
@@ -72,33 +49,13 @@ vault_cli_deploy() {
     return 1
   fi
 
-  if [ -n "$VAULT_RENEW_TOKEN" ]; then
-    _info "Renew the Vault token to default TTL"
-    if ! $VAULT_CMD token renew; then
-      _err "Failed to renew the Vault token"
-      return 1
-    fi
-  fi
-
-  if [ -n "$VAULT_FABIO_MODE" ]; then
-    _info "Writing certificate and key to ${VAULT_PREFIX}/${_cdomain} in Fabio mode"
-    $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}" cert=@"$_cfullchain" key=@"$_ckey" || return 1
+  if [ -n "$FABIO" ]; then
+    $VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}" cert=@"$_cfullchain" key=@"$_ckey" || return 1
   else
-    _info "Writing certificate to ${VAULT_PREFIX}/${_cdomain}/cert.pem"
-    $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}/cert.pem" value=@"$_ccert" || return 1
-    _info "Writing key to ${VAULT_PREFIX}/${_cdomain}/cert.key"
-    $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}/cert.key" value=@"$_ckey" || return 1
-    _info "Writing CA certificate to ${VAULT_PREFIX}/${_cdomain}/ca.pem"
-    $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}/ca.pem" value=@"$_cca" || return 1
-    _info "Writing full-chain certificate to ${VAULT_PREFIX}/${_cdomain}/fullchain.pem"
-    $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}/fullchain.pem" value=@"$_cfullchain" || return 1
-
-    # To make it compatible with the wrong ca path `chain.pem` which was used in former versions
-    if $VAULT_CMD kv get "${VAULT_PREFIX}/${_cdomain}/chain.pem" >/dev/null; then
-      _err "The CA certificate has moved from chain.pem to ca.pem, if you don't depend on chain.pem anymore, you can delete it to avoid this warning"
-      _info "Updating CA certificate to ${VAULT_PREFIX}/${_cdomain}/chain.pem for backward compatibility"
-      $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}/chain.pem" value=@"$_cca" || return 1
-    fi
+    $VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/cert.pem" value=@"$_ccert" || return 1
+    $VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/cert.key" value=@"$_ckey" || return 1
+    $VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/chain.pem" value=@"$_cca" || return 1
+    $VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/fullchain.pem" value=@"$_cfullchain" || return 1
   fi
 
 }

deploy/vsftpd.sh

@@ -106,5 +106,5 @@ vsftpd_deploy() {
     fi
     return 1
   fi
-
+  return 0
 }

dnsapi/dns_1984hosting.sh

@@ -1,171 +1,167 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_1984hosting_info='1984.hosting
-Domains: 1984.is
-Site: 1984.hosting
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_1984hosting
-Options:
- One984HOSTING_Username Username
- One984HOSTING_Password Password
-Issues: github.com/acmesh-official/acme.sh/issues/2851
-Author: Adrian Fedoreanu
-'
+#This file name is "dns_1984hosting.sh"
+#So, here must be a method dns_1984hosting_add()
+#Which will be called by acme.sh to add the txt record to your api system.
+#returns 0 means success, otherwise error.
 
-######## Public functions #####################
+#Author: Adrian Fedoreanu
+#Report Bugs here: https://github.com/acmesh-official/acme.sh
+# or here... https://github.com/acmesh-official/acme.sh/issues/2851
+#
+########  Public functions #####################
 
-# Usage: dns_1984hosting_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-# Add a text record.
+# Export 1984HOSTING username and password in following variables
+#
+#  One984HOSTING_Username=username
+#  One984HOSTING_Password=password
+#
+# sessionid cookie is saved in ~/.acme.sh/account.conf
+# username/password need to be set only when changed.
+
+#Usage: dns_1984hosting_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_1984hosting_add() {
   fulldomain=$1
   txtvalue=$2
 
-  _info "Add TXT record using 1984Hosting."
+  _info "Add TXT record using 1984Hosting"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
 
   if ! _1984hosting_login; then
-    _err "1984Hosting login failed for user $One984HOSTING_Username. Check $HTTP_HEADER file."
+    _err "1984Hosting login failed for user $One984HOSTING_Username. Check $HTTP_HEADER file"
     return 1
   fi
 
-  _debug "First detect the root zone."
+  _debug "First detect the root zone"
   if ! _get_root "$fulldomain"; then
-    _err "Invalid domain '$fulldomain'."
+    _err "invalid domain" "$fulldomain"
     return 1
   fi
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
 
-  _debug "Add TXT record $fulldomain with value '$txtvalue'."
+  _debug "Add TXT record $fulldomain with value '$txtvalue'"
   value="$(printf '%s' "$txtvalue" | _url_encode)"
-  url="https://1984.hosting/domains/entry/"
+  url="https://management.1984hosting.com/domains/entry/"
 
   postdata="entry=new"
   postdata="$postdata&type=TXT"
-  postdata="$postdata&ttl=900"
+  postdata="$postdata&ttl=3600"
   postdata="$postdata&zone=$_domain"
   postdata="$postdata&host=$_sub_domain"
   postdata="$postdata&rdata=%22$value%22"
   _debug2 postdata "$postdata"
 
   _authpost "$postdata" "$url"
-  if _contains "$_response" '"haserrors": true'; then
-    _err "1984Hosting failed to add TXT record for $_sub_domain bad RC from _post."
+  response="$(echo "$_response" | _normalizeJson)"
+  _debug2 response "$response"
+
+  if _contains "$response" '"haserrors": true'; then
+    _err "1984Hosting failed to add TXT record for $_sub_domain bad RC from _post"
     return 1
-  elif _contains "$_response" "html>"; then
-    _err "1984Hosting failed to add TXT record for $_sub_domain. Check $HTTP_HEADER file."
+  elif _contains "$response" "<html>"; then
+    _err "1984Hosting failed to add TXT record for $_sub_domain. Check $HTTP_HEADER file"
     return 1
-  elif _contains "$_response" '"auth": false'; then
-    _err "1984Hosting failed to add TXT record for $_sub_domain. Invalid or expired cookie."
+  elif _contains "$response" '"auth": false'; then
+    _err "1984Hosting failed to add TXT record for $_sub_domain. Invalid or expired cookie"
     return 1
   fi
 
-  _info "Added acme challenge TXT record for $fulldomain at 1984Hosting."
+  _info "Added acme challenge TXT record for $fulldomain at 1984Hosting"
   return 0
 }
 
-# Usage: fulldomain txtvalue
-# Remove the txt record after validation.
+#Usage: fulldomain txtvalue
+#Remove the txt record after validation.
 dns_1984hosting_rm() {
   fulldomain=$1
   txtvalue=$2
 
-  _info "Delete TXT record using 1984Hosting."
+  _info "Delete TXT record using 1984Hosting"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
 
   if ! _1984hosting_login; then
-    _err "1984Hosting login failed for user $One984HOSTING_Username. Check $HTTP_HEADER file."
+    _err "1984Hosting login failed for user $One984HOSTING_Username. Check $HTTP_HEADER file"
     return 1
   fi
 
-  _debug "First detect the root zone."
+  _debug "First detect the root zone"
   if ! _get_root "$fulldomain"; then
-    _err "Invalid domain '$fulldomain'."
+    _err "invalid domain" "$fulldomain"
     return 1
   fi
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
-  _debug "Delete $fulldomain TXT record."
 
-  url="https://1984.hosting/domains"
-  if ! _get_zone_id "$url" "$_domain"; then
-    _err "Invalid zone '$_domain'."
+  _debug "Delete $fulldomain TXT record"
+  url="https://management.1984hosting.com/domains"
+
+  _htmlget "$url" "$_domain"
+  _debug2 _response "$_response"
+  zone_id="$(echo "$_response" | _egrep_o 'zone\/[0-9]+')"
+  _debug2 zone_id "$zone_id"
+  if [ -z "$zone_id" ]; then
+    _err "Error getting zone_id for $1"
     return 1
   fi
 
-  _htmlget "$url/$_zone_id" "$txtvalue"
+  _htmlget "$url/$zone_id" "$_sub_domain"
+  _debug2 _response "$_response"
   entry_id="$(echo "$_response" | _egrep_o 'entry_[0-9]+' | sed 's/entry_//')"
   _debug2 entry_id "$entry_id"
   if [ -z "$entry_id" ]; then
-    _err "Error getting TXT entry_id for $1."
+    _err "Error getting TXT entry_id for $1"
     return 1
   fi
 
   _authpost "entry=$entry_id" "$url/delentry/"
-  if ! _contains "$_response" '"ok": true'; then
-    _err "1984Hosting failed to delete TXT record for $entry_id bad RC from _post."
+  response="$(echo "$_response" | _normalizeJson)"
+  _debug2 response "$response"
+
+  if ! _contains "$response" '"ok": true'; then
+    _err "1984Hosting failed to delete TXT record for $entry_id bad RC from _post"
     return 1
   fi
 
-  _info "Deleted acme challenge TXT record for $fulldomain at 1984Hosting."
+  _info "Deleted acme challenge TXT record for $fulldomain at 1984Hosting"
   return 0
 }
 
 ####################  Private functions below ##################################
+
+# usage: _1984hosting_login username password
+# returns 0 success
 _1984hosting_login() {
   if ! _check_credentials; then return 1; fi
 
-  if _check_cookies; then
-    _debug "Already logged in."
+  if _check_cookie; then
+    _debug "Already logged in"
     return 0
   fi
 
-  _debug "Login to 1984Hosting as user $One984HOSTING_Username."
+  _debug "Login to 1984Hosting as user $One984HOSTING_Username"
   username=$(printf '%s' "$One984HOSTING_Username" | _url_encode)
   password=$(printf '%s' "$One984HOSTING_Password" | _url_encode)
-  url="https://1984.hosting/api/auth/"
+  url="https://management.1984hosting.com/accounts/checkuserauth/"
 
-  _get "https://1984.hosting/accounts/login/" | grep "csrfmiddlewaretoken"
-  csrftoken="$(grep -i '^set-cookie:' "$HTTP_HEADER" | _egrep_o 'csrftoken=[^;]*;' | tr -d ';')"
-  sessionid="$(grep -i '^set-cookie:' "$HTTP_HEADER" | _egrep_o 'sessionid=[^;]*;' | tr -d ';')"
-
-  if [ -z "$csrftoken" ] || [ -z "$sessionid" ]; then
-    _err "One or more cookies are empty: '$csrftoken', '$sessionid'."
-    return 1
-  fi
-
-  export _H1="Cookie: $csrftoken; $sessionid"
-  export _H2="Referer: https://1984.hosting/accounts/login/"
-  csrf_header=$(echo "$csrftoken" | sed 's/csrftoken=//' | _head_n 1)
-  export _H3="X-CSRFToken: $csrf_header"
-
-  response="$(_post "username=$username&password=$password&otpkey=" $url)"
+  response="$(_post "username=$username&password=$password&otpkey=" "$url")"
   response="$(echo "$response" | _normalizeJson)"
   _debug2 response "$response"
 
   if _contains "$response" '"loggedin": true'; then
-    One984HOSTING_SESSIONID_COOKIE="$(grep -i '^set-cookie:' "$HTTP_HEADER" | _egrep_o 'sessionid=[^;]*;' | tr -d ';')"
-    One984HOSTING_CSRFTOKEN_COOKIE="$(grep -i '^set-cookie:' "$HTTP_HEADER" | _egrep_o 'csrftoken=[^;]*;' | tr -d ';')"
-    export One984HOSTING_SESSIONID_COOKIE
-    export One984HOSTING_CSRFTOKEN_COOKIE
-    _saveaccountconf_mutable One984HOSTING_Username "$One984HOSTING_Username"
-    _saveaccountconf_mutable One984HOSTING_Password "$One984HOSTING_Password"
-    _saveaccountconf_mutable One984HOSTING_SESSIONID_COOKIE "$One984HOSTING_SESSIONID_COOKIE"
-    _saveaccountconf_mutable One984HOSTING_CSRFTOKEN_COOKIE "$One984HOSTING_CSRFTOKEN_COOKIE"
+    One984HOSTING_COOKIE="$(grep -i '^set-cookie:' "$HTTP_HEADER" | _tail_n 1 | _egrep_o 'sessionid=[^;]*;' | tr -d ';')"
+    export One984HOSTING_COOKIE
+    _saveaccountconf_mutable One984HOSTING_COOKIE "$One984HOSTING_COOKIE"
     return 0
   fi
   return 1
 }
 
 _check_credentials() {
-  One984HOSTING_Username="${One984HOSTING_Username:-$(_readaccountconf_mutable One984HOSTING_Username)}"
-  One984HOSTING_Password="${One984HOSTING_Password:-$(_readaccountconf_mutable One984HOSTING_Password)}"
   if [ -z "$One984HOSTING_Username" ] || [ -z "$One984HOSTING_Password" ]; then
     One984HOSTING_Username=""
     One984HOSTING_Password=""
-    _clearaccountconf_mutable One984HOSTING_Username
-    _clearaccountconf_mutable One984HOSTING_Password
     _err "You haven't specified 1984Hosting username or password yet."
     _err "Please export as One984HOSTING_Username / One984HOSTING_Password and try again."
     return 1
@@ -173,47 +169,44 @@ _check_credentials() {
   return 0
 }
 
-_check_cookies() {
-  One984HOSTING_SESSIONID_COOKIE="${One984HOSTING_SESSIONID_COOKIE:-$(_readaccountconf_mutable One984HOSTING_SESSIONID_COOKIE)}"
-  One984HOSTING_CSRFTOKEN_COOKIE="${One984HOSTING_CSRFTOKEN_COOKIE:-$(_readaccountconf_mutable One984HOSTING_CSRFTOKEN_COOKIE)}"
-  if [ -z "$One984HOSTING_SESSIONID_COOKIE" ] || [ -z "$One984HOSTING_CSRFTOKEN_COOKIE" ]; then
-    _debug "No cached cookie(s) found."
+_check_cookie() {
+  One984HOSTING_COOKIE="${One984HOSTING_COOKIE:-$(_readaccountconf_mutable One984HOSTING_COOKIE)}"
+  if [ -z "$One984HOSTING_COOKIE" ]; then
+    _debug "No cached cookie found"
     return 1
   fi
 
-  _authget "https://1984.hosting/api/auth/"
-  if _contains "$_response" '"ok": true'; then
-    _debug "Cached cookies still valid."
+  _authget "https://management.1984hosting.com/accounts/loginstatus/"
+  response="$(echo "$_response" | _normalizeJson)"
+  if _contains "$response" '"ok": true'; then
+    _debug "Cached cookie still valid"
     return 0
   fi
-
-  _debug "Cached cookies no longer valid. Clearing cookies."
-  One984HOSTING_SESSIONID_COOKIE=""
-  One984HOSTING_CSRFTOKEN_COOKIE=""
-  _clearaccountconf_mutable One984HOSTING_SESSIONID_COOKIE
-  _clearaccountconf_mutable One984HOSTING_CSRFTOKEN_COOKIE
+  _debug "Cached cookie no longer valid"
+  One984HOSTING_COOKIE=""
+  _saveaccountconf_mutable One984HOSTING_COOKIE "$One984HOSTING_COOKIE"
   return 1
 }
 
-# _acme-challenge.www.domain.com
-# Returns
-#  _sub_domain=_acme-challenge.www
-#  _domain=domain.com
+#_acme-challenge.www.domain.com
+#returns
+# _sub_domain=_acme-challenge.www
+# _domain=domain.com
 _get_root() {
   domain="$1"
-  i=1
+  i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
 
-    # not valid
     if [ -z "$h" ]; then
+      #not valid
       return 1
     fi
 
-    _authget "https://1984.hosting/domains/zonestatus/$h/?cached=no"
-    if _contains "$_response" '"ok": true'; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+    _authget "https://management.1984hosting.com/domains/soacheck/?zone=$h&nameserver=ns0.1984.is."
+    if _contains "$_response" "serial"; then
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       _domain="$h"
       return 0
     fi
@@ -223,46 +216,21 @@ _get_root() {
   return 1
 }
 
-# Usage: _get_zone_id url domain.com
-# Returns zone id for domain.com
-_get_zone_id() {
-  url=$1
-  domain=$2
-  _htmlget "$url" "$domain"
-  _zone_id="$(echo "$_response" | _egrep_o 'zone\/[0-9]+' | _head_n 1)"
-  _debug2 _zone_id "$_zone_id"
-  if [ -z "$_zone_id" ]; then
-    _err "Error getting _zone_id for $2."
-    return 1
-  fi
-  return 0
-}
-
-# Add extra headers to request
+# add extra headers to request
 _authget() {
-  export _H1="Cookie: $One984HOSTING_CSRFTOKEN_COOKIE; $One984HOSTING_SESSIONID_COOKIE"
-  _response=$(_get "$1" | _normalizeJson)
-  _debug2 _response "$_response"
+  export _H1="Cookie: $One984HOSTING_COOKIE"
+  _response=$(_get "$1")
 }
 
-# Truncate huge HTML response
+# truncate huge HTML response
+# echo: Argument list too long
 _htmlget() {
-  export _H1="Cookie: $One984HOSTING_CSRFTOKEN_COOKIE; $One984HOSTING_SESSIONID_COOKIE"
-  _response=$(_get "$1" | grep "$2")
-  if _contains "$_response" "@$2"; then
-    _response=$(echo "$_response" | grep -v "[@]" | _head_n 1)
-  fi
-  _debug2 _response "$_response"
+  export _H1="Cookie: $One984HOSTING_COOKIE"
+  _response=$(_get "$1" | grep "$2" | _head_n 1)
 }
 
-# Add extra headers to request
+# add extra headers to request
 _authpost() {
-  url="https://1984.hosting/domains"
-  _get_zone_id "$url" "$_domain"
-  csrf_header="$(echo "$One984HOSTING_CSRFTOKEN_COOKIE" | _egrep_o "=[^=][0-9a-zA-Z]*" | tr -d "=")"
-  export _H1="Cookie: $One984HOSTING_CSRFTOKEN_COOKIE; $One984HOSTING_SESSIONID_COOKIE"
-  export _H2="Referer: https://1984.hosting/domains/$_zone_id"
-  export _H3="X-CSRFToken: $csrf_header"
-  _response="$(_post "$1" "$2" | _normalizeJson)"
-  _debug2 _response "$_response"
+  export _H1="Cookie: $One984HOSTING_COOKIE"
+  _response=$(_post "$1" "$2")
 }

dnsapi/dns_acmedns.sh

@@ -1,70 +1,31 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_acmedns_info='acme-dns Server API
- The acme-dns is a limited DNS server with RESTful API to handle ACME DNS challenges.
-Site: github.com/joohoi/acme-dns
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_acmedns
-Options:
- ACMEDNS_USERNAME Username. Optional.
- ACMEDNS_PASSWORD Password. Optional.
- ACMEDNS_SUBDOMAIN Subdomain. Optional.
- ACMEDNS_BASE_URL API endpoint. Default: "https://auth.acme-dns.io".
-Issues: github.com/dampfklon/acme.sh
-Author: Wolfgang Ebner, Sven Neubuaer
-'
-
+#
+#Author: Wolfgang Ebner
+#Report Bugs here: https://github.com/webner/acme.sh
+#
 ########  Public functions #####################
 
 #Usage: dns_acmedns_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-# Used to add txt record
 dns_acmedns_add() {
   fulldomain=$1
   txtvalue=$2
   _info "Using acme-dns"
-  _debug "fulldomain $fulldomain"
-  _debug "txtvalue $txtvalue"
+  _debug fulldomain "$fulldomain"
+  _debug txtvalue "$txtvalue"
 
-  #for compatiblity from account conf
+  ACMEDNS_UPDATE_URL="${ACMEDNS_UPDATE_URL:-$(_readaccountconf_mutable ACMEDNS_UPDATE_URL)}"
   ACMEDNS_USERNAME="${ACMEDNS_USERNAME:-$(_readaccountconf_mutable ACMEDNS_USERNAME)}"
-  _clearaccountconf_mutable ACMEDNS_USERNAME
   ACMEDNS_PASSWORD="${ACMEDNS_PASSWORD:-$(_readaccountconf_mutable ACMEDNS_PASSWORD)}"
-  _clearaccountconf_mutable ACMEDNS_PASSWORD
   ACMEDNS_SUBDOMAIN="${ACMEDNS_SUBDOMAIN:-$(_readaccountconf_mutable ACMEDNS_SUBDOMAIN)}"
-  _clearaccountconf_mutable ACMEDNS_SUBDOMAIN
 
-  ACMEDNS_BASE_URL="${ACMEDNS_BASE_URL:-$(_readdomainconf ACMEDNS_BASE_URL)}"
-  ACMEDNS_USERNAME="${ACMEDNS_USERNAME:-$(_readdomainconf ACMEDNS_USERNAME)}"
-  ACMEDNS_PASSWORD="${ACMEDNS_PASSWORD:-$(_readdomainconf ACMEDNS_PASSWORD)}"
-  ACMEDNS_SUBDOMAIN="${ACMEDNS_SUBDOMAIN:-$(_readdomainconf ACMEDNS_SUBDOMAIN)}"
-
-  if [ "$ACMEDNS_BASE_URL" = "" ]; then
-    ACMEDNS_BASE_URL="https://auth.acme-dns.io"
+  if [ "$ACMEDNS_UPDATE_URL" = "" ]; then
+    ACMEDNS_UPDATE_URL="https://auth.acme-dns.io/update"
   fi
 
-  ACMEDNS_UPDATE_URL="$ACMEDNS_BASE_URL/update"
-  ACMEDNS_REGISTER_URL="$ACMEDNS_BASE_URL/register"
-
-  if [ -z "$ACMEDNS_USERNAME" ] || [ -z "$ACMEDNS_PASSWORD" ]; then
-    response="$(_post "" "$ACMEDNS_REGISTER_URL" "" "POST")"
-    _debug response "$response"
-    ACMEDNS_USERNAME=$(echo "$response" | sed -n 's/^{.*\"username\":[ ]*\"\([^\"]*\)\".*}/\1/p')
-    _debug "received username: $ACMEDNS_USERNAME"
-    ACMEDNS_PASSWORD=$(echo "$response" | sed -n 's/^{.*\"password\":[ ]*\"\([^\"]*\)\".*}/\1/p')
-    _debug "received password: $ACMEDNS_PASSWORD"
-    ACMEDNS_SUBDOMAIN=$(echo "$response" | sed -n 's/^{.*\"subdomain\":[ ]*\"\([^\"]*\)\".*}/\1/p')
-    _debug "received subdomain: $ACMEDNS_SUBDOMAIN"
-    ACMEDNS_FULLDOMAIN=$(echo "$response" | sed -n 's/^{.*\"fulldomain\":[ ]*\"\([^\"]*\)\".*}/\1/p')
-    _info "##########################################################"
-    _info "# Create $fulldomain CNAME $ACMEDNS_FULLDOMAIN DNS entry #"
-    _info "##########################################################"
-    _info "Press enter to continue... "
-    read -r _
-  fi
-
-  _savedomainconf ACMEDNS_BASE_URL "$ACMEDNS_BASE_URL"
-  _savedomainconf ACMEDNS_USERNAME "$ACMEDNS_USERNAME"
-  _savedomainconf ACMEDNS_PASSWORD "$ACMEDNS_PASSWORD"
-  _savedomainconf ACMEDNS_SUBDOMAIN "$ACMEDNS_SUBDOMAIN"
+  _saveaccountconf_mutable ACMEDNS_UPDATE_URL "$ACMEDNS_UPDATE_URL"
+  _saveaccountconf_mutable ACMEDNS_USERNAME "$ACMEDNS_USERNAME"
+  _saveaccountconf_mutable ACMEDNS_PASSWORD "$ACMEDNS_PASSWORD"
+  _saveaccountconf_mutable ACMEDNS_SUBDOMAIN "$ACMEDNS_SUBDOMAIN"
 
   export _H1="X-Api-User: $ACMEDNS_USERNAME"
   export _H2="X-Api-Key: $ACMEDNS_PASSWORD"
@@ -87,8 +48,8 @@ dns_acmedns_rm() {
   fulldomain=$1
   txtvalue=$2
   _info "Using acme-dns"
-  _debug "fulldomain $fulldomain"
-  _debug "txtvalue $txtvalue"
+  _debug fulldomain "$fulldomain"
+  _debug txtvalue "$txtvalue"
 }
 
 ####################  Private functions below ##################################

dnsapi/dns_acmeproxy.sh

@@ -1,17 +1,9 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_acmeproxy_info='AcmeProxy Server API
- AcmeProxy can be used to as a single host in your network to request certificates through a DNS API.
- Clients can connect with the one AcmeProxy host so you do not need to store DNS API credentials on every single host.
-Site: github.com/mdbraber/acmeproxy
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_acmeproxy
-Options:
- ACMEPROXY_ENDPOINT API Endpoint
- ACMEPROXY_USERNAME Username
- ACMEPROXY_PASSWORD Password
-Issues: github.com/acmesh-official/acme.sh/issues/2251
-Author: Maarten den Braber
-'
+
+## Acmeproxy DNS provider to be used with acmeproxy (http://github.com/mdbraber/acmeproxy)
+## API integration by Maarten den Braber
+##
+## Report any bugs via https://github.com/mdbraber/acme.sh
 
 dns_acmeproxy_add() {
   fulldomain="${1}"

dnsapi/dns_active24.sh

@@ -1,13 +1,6 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_active24_info='Active24.com
-Site: Active24.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_active24
-Options:
- ACTIVE24_Token API Token
-Issues: github.com/acmesh-official/acme.sh/issues/2059
-Author: Milan Pála
-'
+
+#ACTIVE24_Token="sdfsdfsdfljlbjkljlkjsdfoiwje"
 
 ACTIVE24_Api="https://api.active24.com"
 
@@ -83,10 +76,10 @@ _get_root() {
     return 1
   fi
 
-  i=1
+  i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug "h" "$h"
     if [ -z "$h" ]; then
       #not valid
@@ -94,7 +87,7 @@ _get_root() {
     fi
 
     if _contains "$response" "\"$h\"" >/dev/null; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       _domain=$h
       return 0
     fi

dnsapi/dns_ad.sh

@@ -1,13 +1,12 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_ad_info='AlwaysData.com
-Site: AlwaysData.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_ad
-Options:
- AD_API_KEY API Key
-Issues: github.com/acmesh-official/acme.sh/pull/503
-Author: Paul Koppen
-'
+
+#
+#AD_API_KEY="sdfsdfsdfljlbjkljlkjsdfoiwje"
+
+#This is the Alwaysdata api wrapper for acme.sh
+#
+#Author: Paul Koppen
+#Report Bugs here: https://github.com/wpk-/acme.sh
 
 AD_API_URL="https://$AD_API_KEY:@api.alwaysdata.com/v1"
 
@@ -95,7 +94,7 @@ _get_root() {
   if _ad_rest GET "domain/"; then
     response="$(echo "$response" | tr -d "\n" | sed 's/{/\n&/g')"
     while true; do
-      h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+      h=$(printf "%s" "$domain" | cut -d . -f $i-100)
       _debug h "$h"
       if [ -z "$h" ]; then
         #not valid
@@ -106,7 +105,7 @@ _get_root() {
       if [ "$hostedzone" ]; then
         _domain_id=$(printf "%s\n" "$hostedzone" | _egrep_o "\"id\":\s*[0-9]+" | _head_n 1 | cut -d : -f 2 | tr -d \ )
         if [ "$_domain_id" ]; then
-          _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+          _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
           _domain=$h
           return 0
         fi

dnsapi/dns_ali.sh

@@ -1,27 +1,27 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_ali_info='AlibabaCloud.com
-Domains: Aliyun.com
-Site: AlibabaCloud.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_ali
-Options:
- Ali_Key API Key
- Ali_Secret API Secret
-'
 
-# NOTICE:
-# This file is referenced by Alibaba Cloud Services deploy hooks
-# https://github.com/acmesh-official/acme.sh/pull/5205#issuecomment-2357867276
-# Be careful when modifying this file, especially when making breaking changes for common functions
+Ali_API="https://alidns.aliyuncs.com/"
 
-Ali_DNS_API="https://alidns.aliyuncs.com/"
+#Ali_Key="LTqIA87hOKdjevsf5"
+#Ali_Secret="0p5EYueFNq501xnCPzKNbx6K51qPH2"
 
 #Usage: dns_ali_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_ali_add() {
   fulldomain=$1
   txtvalue=$2
 
-  _prepare_ali_credentials || return 1
+  Ali_Key="${Ali_Key:-$(_readaccountconf_mutable Ali_Key)}"
+  Ali_Secret="${Ali_Secret:-$(_readaccountconf_mutable Ali_Secret)}"
+  if [ -z "$Ali_Key" ] || [ -z "$Ali_Secret" ]; then
+    Ali_Key=""
+    Ali_Secret=""
+    _err "You don't specify aliyun api key and secret yet."
+    return 1
+  fi
+
+  #save the api key and secret to the account conf file.
+  _saveaccountconf_mutable Ali_Key "$Ali_Key"
+  _saveaccountconf_mutable Ali_Secret "$Ali_Secret"
 
   _debug "First detect the root zone"
   if ! _get_root "$fulldomain"; then
@@ -46,74 +46,14 @@ dns_ali_rm() {
   _clean
 }
 
-####################  Alibaba Cloud common functions below  ####################
-
-_prepare_ali_credentials() {
-  Ali_Key="${Ali_Key:-$(_readaccountconf_mutable Ali_Key)}"
-  Ali_Secret="${Ali_Secret:-$(_readaccountconf_mutable Ali_Secret)}"
-  if [ -z "$Ali_Key" ] || [ -z "$Ali_Secret" ]; then
-    Ali_Key=""
-    Ali_Secret=""
-    _err "You don't specify aliyun api key and secret yet."
-    return 1
-  fi
-
-  #save the api key and secret to the account conf file.
-  _saveaccountconf_mutable Ali_Key "$Ali_Key"
-  _saveaccountconf_mutable Ali_Secret "$Ali_Secret"
-}
-
-# act ign mtd
-_ali_rest() {
-  act="$1"
-  ign="$2"
-  mtd="${3:-GET}"
-
-  signature=$(printf "%s" "$mtd&%2F&$(printf "%s" "$query" | _url_encode upper-hex)" | _hmac "sha1" "$(printf "%s" "$Ali_Secret&" | _hex_dump | tr -d " ")" | _base64)
-  signature=$(printf "%s" "$signature" | _url_encode upper-hex)
-  url="$endpoint?Signature=$signature"
-
-  if [ "$mtd" = "GET" ]; then
-    url="$url&$query"
-    response="$(_get "$url")"
-  else
-    response="$(_post "$query" "$url" "" "$mtd" "application/x-www-form-urlencoded")"
-  fi
-
-  _ret="$?"
-  _debug2 response "$response"
-  if [ "$_ret" != "0" ]; then
-    _err "Error <$act>"
-    return 1
-  fi
-
-  if [ -z "$ign" ]; then
-    message="$(echo "$response" | _egrep_o "\"Message\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \")"
-    if [ "$message" ]; then
-      _err "$message"
-      return 1
-    fi
-  fi
-}
-
-_ali_nonce() {
-  #_head_n 1 </dev/urandom | _digest "sha256" hex | cut -c 1-31
-  #Not so good...
-  date +"%s%N" | sed 's/%N//g'
-}
-
-_timestamp() {
-  date -u +"%Y-%m-%dT%H%%3A%M%%3A%SZ"
-}
-
-####################  Private functions below  ####################
+####################  Private functions below ##################################
 
 _get_root() {
   domain=$1
-  i=1
+  i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     if [ -z "$h" ]; then
       #not valid
       return 1
@@ -125,7 +65,7 @@ _get_root() {
     fi
 
     if _contains "$response" "PageNumber"; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       _debug _sub_domain "$_sub_domain"
       _domain="$h"
       _debug _domain "$_domain"
@@ -137,10 +77,52 @@ _get_root() {
   return 1
 }
 
+_ali_rest() {
+  signature=$(printf "%s" "GET&%2F&$(_ali_urlencode "$query")" | _hmac "sha1" "$(printf "%s" "$Ali_Secret&" | _hex_dump | tr -d " ")" | _base64)
+  signature=$(_ali_urlencode "$signature")
+  url="$Ali_API?$query&Signature=$signature"
+
+  if ! response="$(_get "$url")"; then
+    _err "Error <$1>"
+    return 1
+  fi
+
+  _debug2 response "$response"
+  if [ -z "$2" ]; then
+    message="$(echo "$response" | _egrep_o "\"Message\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \")"
+    if [ "$message" ]; then
+      _err "$message"
+      return 1
+    fi
+  fi
+}
+
+_ali_urlencode() {
+  _str="$1"
+  _str_len=${#_str}
+  _u_i=1
+  while [ "$_u_i" -le "$_str_len" ]; do
+    _str_c="$(printf "%s" "$_str" | cut -c "$_u_i")"
+    case $_str_c in [a-zA-Z0-9.~_-])
+      printf "%s" "$_str_c"
+      ;;
+    *)
+      printf "%%%02X" "'$_str_c"
+      ;;
+    esac
+    _u_i="$(_math "$_u_i" + 1)"
+  done
+}
+
+_ali_nonce() {
+  #_head_n 1 </dev/urandom | _digest "sha256" hex | cut -c 1-31
+  #Not so good...
+  date +"%s%N"
+}
+
 _check_exist_query() {
   _qdomain="$1"
   _qsubdomain="$2"
-  endpoint=$Ali_DNS_API
   query=''
   query=$query'AccessKeyId='$Ali_Key
   query=$query'&Action=DescribeDomainRecords'
@@ -156,7 +138,6 @@ _check_exist_query() {
 }
 
 _add_record_query() {
-  endpoint=$Ali_DNS_API
   query=''
   query=$query'AccessKeyId='$Ali_Key
   query=$query'&Action=AddDomainRecord'
@@ -173,7 +154,6 @@ _add_record_query() {
 }
 
 _delete_record_query() {
-  endpoint=$Ali_DNS_API
   query=''
   query=$query'AccessKeyId='$Ali_Key
   query=$query'&Action=DeleteDomainRecord'
@@ -187,7 +167,6 @@ _delete_record_query() {
 }
 
 _describe_records_query() {
-  endpoint=$Ali_DNS_API
   query=''
   query=$query'AccessKeyId='$Ali_Key
   query=$query'&Action=DescribeDomainRecords'
@@ -218,3 +197,7 @@ _clean() {
   fi
 
 }
+
+_timestamp() {
+  date -u +"%Y-%m-%dT%H%%3A%M%%3A%SZ"
+}

dnsapi/dns_alviy.sh

@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_alviy_info='Alviy.com
-Site: Alviy.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_alviy
-Options:
- Alviy_token API token. Get it from the https://cloud.alviy.com/token
-Issues: github.com/acmesh-official/acme.sh/issues/5115
-'
-
-Alviy_Api="https://cloud.alviy.com/api/v1"
-
-########  Public functions #####################
-
-#Usage: dns_alviy_add  _acme-challenge.www.domain.com   "content"
-dns_alviy_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  Alviy_token="${Alviy_token:-$(_readaccountconf_mutable Alviy_token)}"
-  if [ -z "$Alviy_token" ]; then
-    Alviy_token=""
-    _err "Please specify Alviy token."
-    return 1
-  fi
-
-  #save the api key and email to the account conf file.
-  _saveaccountconf_mutable Alviy_token "$Alviy_token"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting existing records"
-  if _alviy_txt_exists "$_domain" "$fulldomain" "$txtvalue"; then
-    _info "This record already exists, skipping"
-    return 0
-  fi
-
-  _add_data="{\"content\":\"$txtvalue\",\"type\":\"TXT\"}"
-  _debug2 _add_data "$_add_data"
-  _info "Adding record"
-  if _alviy_rest POST "zone/$_domain/domain/$fulldomain/" "$_add_data"; then
-    _debug "Checking updated records of '${fulldomain}'"
-
-    if ! _alviy_txt_exists "$_domain" "$fulldomain" "$txtvalue"; then
-      _err "TXT record '${txtvalue}' for '${fulldomain}', value wasn't set!"
-      return 1
-    fi
-
-  else
-    _err "Add txt record error, value '${txtvalue}' for '${fulldomain}' was not set."
-    return 1
-  fi
-
-  _sleep 10
-  _info "Added TXT record '${txtvalue}' for '${fulldomain}'."
-  return 0
-}
-
-#fulldomain
-dns_alviy_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  Alviy_token="${Alviy_token:-$(_readaccountconf_mutable Alviy_token)}"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  if ! _alviy_txt_exists "$_domain" "$fulldomain" "$txtvalue"; then
-    _info "The record does not exist, skip"
-    return 0
-  fi
-
-  _add_data=""
-  uuid=$(echo "$response" | tr "{" "\n" | grep "$txtvalue" | tr "," "\n" | grep uuid | cut -d \" -f4)
-  # delete record
-  _debug "Delete TXT record for '${fulldomain}'"
-  if ! _alviy_rest DELETE "zone/$_domain/record/$uuid" "{\"confirm\":1}"; then
-    _err "Cannot delete empty TXT record for '$fulldomain'"
-    return 1
-  fi
-  _info "The record '$fulldomain'='$txtvalue' deleted"
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-_get_root() {
-  domain=$1
-  i=3
-  a="init"
-  while [ -n "$a" ]; do
-    a=$(printf "%s" "$domain" | cut -d . -f $i-)
-    i=$((i + 1))
-  done
-  n=$((i - 3))
-  h=$(printf "%s" "$domain" | cut -d . -f $n-)
-  if [ -z "$h" ]; then
-    #not valid
-    _alviy_rest GET "zone/$domain/"
-    _debug "can't get host from $domain"
-    return 1
-  fi
-
-  if ! _alviy_rest GET "zone/$h/"; then
-    return 1
-  fi
-
-  if _contains "$response" '"code":"NOT_FOUND"'; then
-    _debug "$h not found"
-  else
-    s=$((n - 1))
-    _sub_domain=$(printf "%s" "$domain" | cut -d . -f -$s)
-    _domain="$h"
-    return 0
-  fi
-  return 1
-}
-
-_alviy_txt_exists() {
-  zone=$1
-  domain=$2
-  content_data=$3
-  _debug "Getting existing records"
-
-  if ! _alviy_rest GET "zone/$zone/domain/$domain/TXT/"; then
-    _info "The record does not exist"
-    return 1
-  fi
-
-  if ! _contains "$response" "$3"; then
-    _info "The record has other value"
-    return 1
-  fi
-  # GOOD code return - TRUE function
-  return 0
-}
-
-_alviy_rest() {
-  method=$1
-  path="$2"
-  content_data="$3"
-  _debug "$path"
-
-  export _H1="Authorization: Bearer $Alviy_token"
-  export _H2="Content-Type: application/json"
-
-  if [ "$content_data" ] || [ "$method" = "DELETE" ]; then
-    _debug "data ($method): " "$content_data"
-    response="$(_post "$content_data" "$Alviy_Api/$path" "" "$method")"
-  else
-    response="$(_get "$Alviy_Api/$path")"
-  fi
-  _code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\\r\\n")"
-  if [ "$_code" = "401" ]; then
-    _err "It seems that your api key or secret is not correct."
-    return 1
-  fi
-
-  if [ "$_code" != "200" ]; then
-    _err "API call error ($method): $path Response code $_code"
-  fi
-  if [ "$?" != "0" ]; then
-    _err "error on rest call ($method): $path. Response:"
-    _err "$response"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}

dnsapi/dns_anx.sh

@@ -1,12 +1,9 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_anx_info='Anexia.com CloudDNS
-Site: Anexia.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_anx
-Options:
- ANX_Token API Token
-Issues: github.com/acmesh-official/acme.sh/issues/3238
-'
+
+# Anexia CloudDNS acme.sh hook
+# Author: MA
+
+#ANX_Token="xxxx"
 
 ANX_API='https://engine.anexia-it.com/api/clouddns/v1'
 
@@ -130,17 +127,18 @@ _get_root() {
   i=1
   p=1
 
+  _anx_rest GET "zone.json"
+
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug h "$h"
     if [ -z "$h" ]; then
       #not valid
       return 1
     fi
 
-    _anx_rest GET "zone.json/${h}"
     if _contains "$response" "\"name\":\"$h\""; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       _domain=$h
       return 0
     fi

dnsapi/dns_artfiles.sh

@@ -1,177 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_artfiles_info='ArtFiles.de
-Site: ArtFiles.de
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_artfiles
-Options:
- AF_API_USERNAME API Username
- AF_API_PASSWORD API Password
-Issues: github.com/acmesh-official/acme.sh/issues/4718
-Author: Martin Arndt <https://troublezone.net/>
-'
-
-########## API configuration ###################################################
-
-AF_API_SUCCESS='status":"OK'
-AF_URL_DCP='https://dcp.c.artfiles.de/api/'
-AF_URL_DNS=${AF_URL_DCP}'dns/{*}_dns.html?domain='
-AF_URL_DOMAINS=${AF_URL_DCP}'domain/get_domains.html'
-
-########## Public functions ####################################################
-
-# Adds a new TXT record for given ACME challenge value & domain.
-# Usage: dns_artfiles_add _acme-challenge.www.example.com "ACME challenge value"
-dns_artfiles_add() {
-  domain="$1"
-  txtValue="$2"
-  _info 'Using ArtFiles.de DNS addition API…'
-  _debug 'Domain' "$domain"
-  _debug 'txtValue' "$txtValue"
-
-  _set_credentials
-  _saveaccountconf_mutable 'AF_API_USERNAME' "$AF_API_USERNAME"
-  _saveaccountconf_mutable 'AF_API_PASSWORD' "$AF_API_PASSWORD"
-
-  _set_headers
-  _get_zone "$domain"
-  _dns 'GET'
-  if ! _contains "$response" 'TXT'; then
-    _err 'Retrieving TXT records failed.'
-
-    return 1
-  fi
-
-  _clean_records
-  _dns 'SET' "$(printf -- '%s\n_acme-challenge "%s"' "$response" "$txtValue")"
-  if ! _contains "$response" "$AF_API_SUCCESS"; then
-    _err 'Adding ACME challenge value failed.'
-
-    return 1
-  fi
-}
-
-# Removes the existing TXT record for given ACME challenge value & domain.
-# Usage: dns_artfiles_rm _acme-challenge.www.example.com "ACME challenge value"
-dns_artfiles_rm() {
-  domain="$1"
-  txtValue="$2"
-  _info 'Using ArtFiles.de DNS removal API…'
-  _debug 'Domain' "$domain"
-  _debug 'txtValue' "$txtValue"
-
-  _set_credentials
-  _set_headers
-  _get_zone "$domain"
-  if ! _dns 'GET'; then
-    return 1
-  fi
-
-  if ! _contains "$response" "$txtValue"; then
-    _err 'Retrieved TXT records are missing given ACME challenge value.'
-
-    return 1
-  fi
-
-  _clean_records
-  response="$(printf -- '%s' "$response" | sed '/_acme-challenge "'"$txtValue"'"/d')"
-  _dns 'SET' "$response"
-  if ! _contains "$response" "$AF_API_SUCCESS"; then
-    _err 'Removing ACME challenge value failed.'
-
-    return 1
-  fi
-}
-
-########## Private functions ###################################################
-
-# Cleans awful TXT records response of ArtFiles's API & pretty prints it.
-# Usage: _clean_records
-_clean_records() {
-  _info 'Cleaning TXT records…'
-  # Extract TXT part, strip trailing quote sign (ACME.sh API guidelines forbid
-  # usage of SED's GNU extensions, hence couldn't omit it via regex), strip '\'
-  # from '\"' & turn '\n' into real LF characters.
-  # Yup, awful API to use - but that's all we got to get this working, so… ;)
-  _debug2 'Raw  ' "$response"
-  response="$(printf -- '%s' "$response" | sed 's/^.*TXT":"\([^}]*\).*$/\1/;s/,".*$//;s/.$//;s/\\"/"/g;s/\\n/\n/g')"
-  _debug2 'Clean' "$response"
-}
-
-# Executes an HTTP GET or POST request for getting or setting DNS records,
-# containing given payload upon POST.
-# Usage: _dns [GET | SET] [payload]
-_dns() {
-  _info 'Executing HTTP request…'
-  action="$1"
-  payload="$(printf -- '%s' "$2" | _url_encode)"
-  url="$(printf -- '%s%s' "$AF_URL_DNS" "$domain" | sed 's/{\*}/'"$(printf -- '%s' "$action" | _lower_case)"'/')"
-
-  if [ "$action" = 'SET' ]; then
-    _debug2 'Payload' "$payload"
-    response="$(_post '' "$url&TXT=$payload" '' 'POST' 'application/x-www-form-urlencoded')"
-  else
-    response="$(_get "$url" '' 10)"
-  fi
-
-  if ! _contains "$response" "$AF_API_SUCCESS"; then
-    _err "DNS API error: $response"
-
-    return 1
-  fi
-
-  _debug 'Response' "$response"
-
-  return 0
-}
-
-# Gets the root domain zone for given domain.
-# Usage: _get_zone _acme-challenge.www.example.com
-_get_zone() {
-  fqdn="$1"
-  domains="$(_get "$AF_URL_DOMAINS" '' 10)"
-  _info 'Getting domain zone…'
-  _debug2 'FQDN' "$fqdn"
-  _debug2 'Domains' "$domains"
-
-  while _contains "$fqdn" "."; do
-    if _contains "$domains" "$fqdn"; then
-      domain="$fqdn"
-      _info "Found root domain zone: $domain"
-      break
-    else
-      fqdn="${fqdn#*.}"
-      _debug2 'FQDN' "$fqdn"
-    fi
-  done
-
-  if [ "$domain" = "$fqdn" ]; then
-    return 0
-  fi
-
-  _err 'Couldn'\''t find root domain zone.'
-
-  return 1
-}
-
-# Sets the credentials for accessing ArtFiles's API
-# Usage: _set_credentials
-_set_credentials() {
-  _info 'Setting credentials…'
-  AF_API_USERNAME="${AF_API_USERNAME:-$(_readaccountconf_mutable AF_API_USERNAME)}"
-  AF_API_PASSWORD="${AF_API_PASSWORD:-$(_readaccountconf_mutable AF_API_PASSWORD)}"
-  if [ -z "$AF_API_USERNAME" ] || [ -z "$AF_API_PASSWORD" ]; then
-    _err 'Missing ArtFiles.de username and/or password.'
-    _err 'Please ensure both are set via export command & try again.'
-
-    return 1
-  fi
-}
-
-# Adds the HTTP Authorization & Content-Type headers to a follow-up request.
-# Usage: _set_headers
-_set_headers() {
-  _info 'Setting headers…'
-  encoded="$(printf -- '%s:%s' "$AF_API_USERNAME" "$AF_API_PASSWORD" | _base64)"
-  export _H1="Authorization: Basic $encoded"
-  export _H2='Content-Type: application/json'
-}

dnsapi/dns_arvan.sh

@@ -1,16 +1,12 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_arvan_info='ArvanCloud.ir
-Site: ArvanCloud.ir
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_arvan
-Options:
- Arvan_Token API Token
-Issues: github.com/acmesh-official/acme.sh/issues/2796
-Author: Vahid Fardi
-'
 
-ARVAN_API_URL="https://napi.arvancloud.ir/cdn/4.0/domains"
+#Arvan_Token="xxxx"
 
+ARVAN_API_URL="https://napi.arvancloud.com/cdn/4.0/domains"
+
+#Author: Ehsan Aliakbar
+#Report Bugs here: https://github.com/Neilpang/acme.sh
+#
 ########  Public functions #####################
 
 #Usage: dns_arvan_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
@@ -23,7 +19,7 @@ dns_arvan_add() {
 
   if [ -z "$Arvan_Token" ]; then
     _err "You didn't specify \"Arvan_Token\" token yet."
-    _err "You can get yours from here https://npanel.arvancloud.ir/profile/api-keys"
+    _err "You can get yours from here https://npanel.arvancloud.com/profile/api-keys"
     return 1
   fi
   #save the api token to the account conf file.
@@ -42,10 +38,9 @@ dns_arvan_add() {
   _info "Adding record"
   if _arvan_rest POST "$_domain/dns-records" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"value\":{\"text\":\"$txtvalue\"},\"ttl\":120}"; then
     if _contains "$response" "$txtvalue"; then
-      _info "response id is $response"
       _info "Added, OK"
       return 0
-    elif _contains "$response" "Record Data is duplicate"; then
+    elif _contains "$response" "Record Data is Duplicated"; then
       _info "Already exists, OK"
       return 0
     else
@@ -54,7 +49,7 @@ dns_arvan_add() {
     fi
   fi
   _err "Add txt record error."
-  return 0
+  return 1
 }
 
 #Usage: fulldomain txtvalue
@@ -78,21 +73,33 @@ dns_arvan_rm() {
   _debug _domain "$_domain"
 
   _debug "Getting txt records"
-  _arvan_rest GET "${_domain}/dns-records"
+  shorted_txtvalue=$(printf "%s" "$txtvalue" | cut -d "-" -d "_" -f1)
+  _arvan_rest GET "${_domain}/dns-records?search=$shorted_txtvalue"
+
   if ! printf "%s" "$response" | grep \"current_page\":1 >/dev/null; then
     _err "Error on Arvan Api"
     _err "Please create a github issue with debbug log"
     return 1
   fi
 
-  _record_id=$(echo "$response" | _egrep_o ".\"id\":\"[^\"]*\",\"type\":\"txt\",\"name\":\"_acme-challenge\",\"value\":{\"text\":\"$txtvalue\"}" | cut -d : -f 2 | cut -d , -f 1 | tr -d \")
-  if ! _arvan_rest "DELETE" "${_domain}/dns-records/${_record_id}"; then
-    _err "Error on Arvan Api"
-    return 1
+  count=$(printf "%s\n" "$response" | _egrep_o "\"total\":[^,]*" | cut -d : -f 2)
+  _debug count "$count"
+  if [ "$count" = "0" ]; then
+    _info "Don't need to remove."
+  else
+    record_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | head -n 1)
+    _debug "record_id" "$record_id"
+    if [ -z "$record_id" ]; then
+      _err "Can not get record id to remove."
+      return 1
+    fi
+    if ! _arvan_rest "DELETE" "${_domain}/dns-records/$record_id"; then
+      _err "Delete record error."
+      return 1
+    fi
+    _debug "$response"
+    _contains "$response" 'dns record deleted'
   fi
-  _debug "$response"
-  _contains "$response" 'dns record deleted'
-  return 0
 }
 
 ####################  Private functions below ##################################
@@ -104,23 +111,24 @@ dns_arvan_rm() {
 # _domain_id=sdjkglgdfewsdfg
 _get_root() {
   domain=$1
-  i=2
+  i=1
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug h "$h"
     if [ -z "$h" ]; then
       #not valid
       return 1
     fi
 
-    if ! _arvan_rest GET "$h"; then
+    if ! _arvan_rest GET "?search=$h"; then
       return 1
     fi
-    if _contains "$response" "\"domain\":\"$h\""; then
-      _domain_id=$(echo "$response" | cut -d : -f 3 | cut -d , -f 1 | tr -d \")
+
+    if _contains "$response" "\"domain\":\"$h\"" || _contains "$response" '"total":1'; then
+      _domain_id=$(echo "$response" | _egrep_o "\[.\"id\":\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \")
       if [ "$_domain_id" ]; then
-        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
         _domain=$h
         return 0
       fi
@@ -138,6 +146,7 @@ _arvan_rest() {
   data="$3"
 
   token_trimmed=$(echo "$Arvan_Token" | tr -d '"')
+
   export _H1="Authorization: $token_trimmed"
 
   if [ "$mtd" = "DELETE" ]; then
@@ -146,11 +155,9 @@ _arvan_rest() {
     response="$(_post "$data" "$ARVAN_API_URL/$ep" "" "$mtd")"
   elif [ "$mtd" = "POST" ]; then
     export _H2="Content-Type: application/json"
-    export _H3="Accept: application/json"
     _debug data "$data"
     response="$(_post "$data" "$ARVAN_API_URL/$ep" "" "$mtd")"
   else
     response="$(_get "$ARVAN_API_URL/$ep$data")"
   fi
-  return 0
 }

dnsapi/dns_aurora.sh

@@ -1,177 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_aurora_info='versio.nl AuroraDNS
-Domains: pcextreme.nl
-Site: versio.nl
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_aurora
-Options:
- AURORA_Key API Key
- AURORA_Secret API Secret
-Issues: github.com/acmesh-official/acme.sh/issues/3459
-Author: Jasper Zonneveld
-'
-
-AURORA_Api="https://api.auroradns.eu"
-
-########  Public functions #####################
-
-#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_aurora_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  AURORA_Key="${AURORA_Key:-$(_readaccountconf_mutable AURORA_Key)}"
-  AURORA_Secret="${AURORA_Secret:-$(_readaccountconf_mutable AURORA_Secret)}"
-
-  if [ -z "$AURORA_Key" ] || [ -z "$AURORA_Secret" ]; then
-    AURORA_Key=""
-    AURORA_Secret=""
-    _err "You didn't specify an Aurora api key and secret yet."
-    _err "You can get yours from here https://cp.pcextreme.nl/auroradns/users."
-    return 1
-  fi
-
-  #save the api key and secret to the account conf file.
-  _saveaccountconf_mutable AURORA_Key "$AURORA_Key"
-  _saveaccountconf_mutable AURORA_Secret "$AURORA_Secret"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _domain_id "$_domain_id"
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _info "Adding record"
-  if _aurora_rest POST "zones/$_domain_id/records" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":300}"; then
-    if _contains "$response" "$txtvalue"; then
-      _info "Added, OK"
-      return 0
-    elif _contains "$response" "RecordExistsError"; then
-      _info "Already exists, OK"
-      return 0
-    else
-      _err "Add txt record error."
-      return 1
-    fi
-  fi
-  _err "Add txt record error."
-  return 1
-
-}
-
-#fulldomain txtvalue
-dns_aurora_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  AURORA_Key="${AURORA_Key:-$(_readaccountconf_mutable AURORA_Key)}"
-  AURORA_Secret="${AURORA_Secret:-$(_readaccountconf_mutable AURORA_Secret)}"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _domain_id "$_domain_id"
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting records"
-  _aurora_rest GET "zones/${_domain_id}/records"
-
-  if ! _contains "$response" "$txtvalue"; then
-    _info "Don't need to remove."
-  else
-    records=$(echo "$response" | _normalizeJson | tr -d "[]" | sed "s/},{/}|{/g" | tr "|" "\n")
-    if [ "$(echo "$records" | wc -l)" -le 2 ]; then
-      _err "Can not parse records."
-      return 1
-    fi
-    record_id=$(echo "$records" | grep "\"type\": *\"TXT\"" | grep "\"name\": *\"$_sub_domain\"" | grep "\"content\": *\"$txtvalue\"" | _egrep_o "\"id\": *\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | _head_n 1 | tr -d " ")
-    _debug "record_id" "$record_id"
-    if [ -z "$record_id" ]; then
-      _err "Can not get record id to remove."
-      return 1
-    fi
-    if ! _aurora_rest DELETE "zones/$_domain_id/records/$record_id"; then
-      _err "Delete record error."
-      return 1
-    fi
-  fi
-  return 0
-
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-# _domain_id=sdjkglgdfewsdfg
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if ! _aurora_rest GET "zones/$h"; then
-      return 1
-    fi
-
-    if _contains "$response" "\"name\": \"$h\""; then
-      _domain_id=$(echo "$response" | _normalizeJson | tr -d "{}" | tr "," "\n" | grep "\"id\": *\"" | cut -d : -f 2 | tr -d \" | _head_n 1 | tr -d " ")
-      _debug _domain_id "$_domain_id"
-      if [ "$_domain_id" ]; then
-        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
-        _domain=$h
-        return 0
-      fi
-      return 1
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_aurora_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-
-  key_trimmed=$(echo "$AURORA_Key" | tr -d '"')
-  secret_trimmed=$(echo "$AURORA_Secret" | tr -d '"')
-
-  timestamp=$(date -u +"%Y%m%dT%H%M%SZ")
-  signature=$(printf "%s/%s%s" "$m" "$ep" "$timestamp" | _hmac sha256 "$(printf "%s" "$secret_trimmed" | _hex_dump | tr -d " ")" | _base64)
-  authorization=$(printf "AuroraDNSv1 %s" "$(printf "%s:%s" "$key_trimmed" "$signature" | _base64)")
-
-  export _H1="Content-Type: application/json; charset=UTF-8"
-  export _H2="X-AuroraDNS-Date: $timestamp"
-  export _H3="Authorization: $authorization"
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$AURORA_Api/$ep" "" "$m")"
-  else
-    response="$(_get "$AURORA_Api/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}

dnsapi/dns_autodns.sh

@@ -1,15 +1,16 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_autodns_info='InternetX autoDNS
- InternetX autoDNS XML API
-Site: InternetX.com/autodns/
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_autodns
-Options:
- AUTODNS_USER Username
- AUTODNS_PASSWORD Password
- AUTODNS_CONTEXT Context
-Author: <auerswald@gmail.com>
-'
+# -*- mode: sh; tab-width: 2; indent-tabs-mode: s; coding: utf-8 -*-
+
+# This is the InternetX autoDNS xml api wrapper for acme.sh
+# Author: auerswald@gmail.com
+# Created: 2018-01-14
+#
+#     export AUTODNS_USER="username"
+#     export AUTODNS_PASSWORD="password"
+#     export AUTODNS_CONTEXT="context"
+#
+# Usage:
+#     acme.sh --issue --dns dns_autodns -d example.com
 
 AUTODNS_API="https://gateway.autodns.com"
 
@@ -110,7 +111,7 @@ _get_autodns_zone() {
   p=1
 
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug h "$h"
 
     if [ -z "$h" ]; then
@@ -128,7 +129,7 @@ _get_autodns_zone() {
     if _contains "$autodns_response" "<summary>1</summary>" >/dev/null; then
       _zone="$(echo "$autodns_response" | _egrep_o '<name>[^<]*</name>' | cut -d '>' -f 2 | cut -d '<' -f 1)"
       _system_ns="$(echo "$autodns_response" | _egrep_o '<system_ns>[^<]*</system_ns>' | cut -d '>' -f 2 | cut -d '<' -f 1)"
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       return 0
     fi
 

dnsapi/dns_aws.sh

@@ -1,15 +1,13 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_aws_info='Amazon AWS Route53 domain API
-Site: docs.aws.amazon.com/route53/
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_aws
-Options:
- AWS_ACCESS_KEY_ID API Key ID
- AWS_SECRET_ACCESS_KEY API Secret
-'
 
-# All `_sleep` commands are included to avoid Route53 throttling, see
-# https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DNSLimitations.html#limits-api-requests
+#
+#AWS_ACCESS_KEY_ID="sdfsdfsdfljlbjkljlkjsdfoiwje"
+#
+#AWS_SECRET_ACCESS_KEY="xxxxxxx"
+
+#This is the Amazon Route53 api wrapper for acme.sh
+#All `_sleep` commands are included to avoid Route53 throttling, see
+#https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DNSLimitations.html#limits-api-requests
 
 AWS_HOST="route53.amazonaws.com"
 AWS_URL="https://$AWS_HOST"
@@ -34,7 +32,7 @@ dns_aws_add() {
   if [ -z "$AWS_ACCESS_KEY_ID" ] || [ -z "$AWS_SECRET_ACCESS_KEY" ]; then
     AWS_ACCESS_KEY_ID=""
     AWS_SECRET_ACCESS_KEY=""
-    _err "You haven't specified the aws route53 api key id and and api key secret yet."
+    _err "You haven't specifed the aws route53 api key id and and api key secret yet."
     _err "Please create your key and try again. see $(__green $AWS_WIKI)"
     return 1
   fi
@@ -147,34 +145,46 @@ dns_aws_rm() {
   fi
   _sleep 1
   return 1
+
 }
 
 ####################  Private functions below ##################################
 
 _get_root() {
   domain=$1
-  i=1
+  i=2
   p=1
 
-  # iterate over names (a.b.c.d -> b.c.d -> c.d -> d)
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100 | sed 's/\./\\./g')
-    _debug "Checking domain: $h"
-    if [ -z "$h" ]; then
-      _error "invalid domain"
-      return 1
-    fi
-
-    # iterate over paginated result for list_hosted_zones
-    aws_rest GET "2013-04-01/hostedzone"
+  if aws_rest GET "2013-04-01/hostedzone"; then
     while true; do
+      h=$(printf "%s" "$domain" | cut -d . -f $i-100)
+      _debug2 "Checking domain: $h"
+      if [ -z "$h" ]; then
+        if _contains "$response" "<IsTruncated>true</IsTruncated>" && _contains "$response" "<NextMarker>"; then
+          _debug "IsTruncated"
+          _nextMarker="$(echo "$response" | _egrep_o "<NextMarker>.*</NextMarker>" | cut -d '>' -f 2 | cut -d '<' -f 1)"
+          _debug "NextMarker" "$_nextMarker"
+          if aws_rest GET "2013-04-01/hostedzone" "marker=$_nextMarker"; then
+            _debug "Truncated request OK"
+            i=2
+            p=1
+            continue
+          else
+            _err "Truncated request error."
+          fi
+        fi
+        #not valid
+        _err "Invalid domain"
+        return 1
+      fi
+
       if _contains "$response" "<Name>$h.</Name>"; then
-        hostedzone="$(echo "$response" | tr -d '\n' | sed 's/<HostedZone>/#&/g' | tr '#' '\n' | _egrep_o "<HostedZone><Id>[^<]*<.Id><Name>$h.<.Name>.*<PrivateZone>false<.PrivateZone>.*<.HostedZone>")"
+        hostedzone="$(echo "$response" | sed 's/<HostedZone>/#&/g' | tr '#' '\n' | _egrep_o "<HostedZone><Id>[^<]*<.Id><Name>$h.<.Name>.*<PrivateZone>false<.PrivateZone>.*<.HostedZone>")"
         _debug hostedzone "$hostedzone"
         if [ "$hostedzone" ]; then
           _domain_id=$(printf "%s\n" "$hostedzone" | _egrep_o "<Id>.*<.Id>" | head -n 1 | _egrep_o ">.*<" | tr -d "<>")
           if [ "$_domain_id" ]; then
-            _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+            _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
             _domain=$h
             return 0
           fi
@@ -182,19 +192,10 @@ _get_root() {
           return 1
         fi
       fi
-      if _contains "$response" "<IsTruncated>true</IsTruncated>" && _contains "$response" "<NextMarker>"; then
-        _debug "IsTruncated"
-        _nextMarker="$(echo "$response" | _egrep_o "<NextMarker>.*</NextMarker>" | cut -d '>' -f 2 | cut -d '<' -f 1)"
-        _debug "NextMarker" "$_nextMarker"
-      else
-        break
-      fi
-      _debug "Checking domain: $h - Next Page "
-      aws_rest GET "2013-04-01/hostedzone" "marker=$_nextMarker"
+      p=$i
+      i=$(_math "$i" + 1)
     done
-    p=$i
-    i=$(_math "$i" + 1)
-  done
+  fi
   return 1
 }
 
@@ -208,40 +209,24 @@ _use_container_role() {
 }
 
 _use_instance_role() {
-  _instance_role_name_url="http://169.254.169.254/latest/meta-data/iam/security-credentials/"
-
-  if _get "$_instance_role_name_url" true 1 | _head_n 1 | grep -Fq 401; then
-    _debug "Using IMDSv2"
-    _token_url="http://169.254.169.254/latest/api/token"
-    export _H1="X-aws-ec2-metadata-token-ttl-seconds: 21600"
-    _token="$(_post "" "$_token_url" "" "PUT")"
-    _secure_debug3 "_token" "$_token"
-    if [ -z "$_token" ]; then
-      _debug "Unable to fetch IMDSv2 token from instance metadata"
-      return 1
-    fi
-    export _H1="X-aws-ec2-metadata-token: $_token"
-  fi
-
-  if ! _get "$_instance_role_name_url" true 1 | _head_n 1 | grep -Fq 200; then
+  _url="http://169.254.169.254/latest/meta-data/iam/security-credentials/"
+  _debug "_url" "$_url"
+  if ! _get "$_url" true 1 | _head_n 1 | grep -Fq 200; then
     _debug "Unable to fetch IAM role from instance metadata"
     return 1
   fi
-
-  _instance_role_name=$(_get "$_instance_role_name_url" "" 1)
-  _debug "_instance_role_name" "$_instance_role_name"
-  _use_metadata "$_instance_role_name_url$_instance_role_name" "$_token"
-
+  _aws_role=$(_get "$_url" "" 1)
+  _debug "_aws_role" "$_aws_role"
+  _use_metadata "$_url$_aws_role"
 }
 
 _use_metadata() {
-  export _H1="X-aws-ec2-metadata-token: $2"
   _aws_creds="$(
     _get "$1" "" 1 |
       _normalizeJson |
       tr '{,}' '\n' |
       while read -r _line; do
-        _key="$(echo "${_line%%:*}" | tr -d '\"')"
+        _key="$(echo "${_line%%:*}" | tr -d '"')"
         _value="${_line#*:}"
         _debug3 "_key" "$_key"
         _secure_debug3 "_value" "$_value"

dnsapi/dns_azion.sh

@@ -1,208 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_azion_info='Azion.om
-Site: Azion.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_azion
-Options:
- AZION_Email Email
- AZION_Password Password
-Issues: github.com/acmesh-official/acme.sh/issues/3555
-'
-
-AZION_Api="https://api.azionapi.net"
-
-########  Public functions ########
-
-# Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-# Used to add txt record
-dns_azion_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _debug "Detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "Domain not found"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-  _debug _domain_id "$_domain_id"
-
-  _info "Add or update record"
-  _get_record "$_domain_id" "$_sub_domain"
-  if [ "$record_id" ]; then
-    _payload="{\"record_type\": \"TXT\", \"entry\": \"$_sub_domain\", \"answers_list\": [$answers_list, \"$txtvalue\"], \"ttl\": 20}"
-    if _azion_rest PUT "intelligent_dns/$_domain_id/records/$record_id" "$_payload"; then
-      if _contains "$response" "$txtvalue"; then
-        _info "Record updated."
-        return 0
-      fi
-    fi
-  else
-    _payload="{\"record_type\": \"TXT\", \"entry\": \"$_sub_domain\", \"answers_list\": [\"$txtvalue\"], \"ttl\": 20}"
-    if _azion_rest POST "intelligent_dns/$_domain_id/records" "$_payload"; then
-      if _contains "$response" "$txtvalue"; then
-        _info "Record added."
-        return 0
-      fi
-    fi
-  fi
-  _err "Failed to add or update record."
-  return 1
-}
-
-# Usage: fulldomain txtvalue
-# Used to remove the txt record after validation
-dns_azion_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _debug "Detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "Domain not found"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-  _debug _domain_id "$_domain_id"
-
-  _info "Removing record"
-  _get_record "$_domain_id" "$_sub_domain"
-  if [ "$record_id" ]; then
-    if _azion_rest DELETE "intelligent_dns/$_domain_id/records/$record_id"; then
-      _info "Record removed."
-      return 0
-    else
-      _err "Failed to remove record."
-      return 1
-    fi
-  else
-    _info "Record not found or already removed."
-    return 0
-  fi
-}
-
-####################  Private functions below ##################################
-# Usage: _acme-challenge.www.domain.com
-# returns
-#  _sub_domain=_acme-challenge.www
-#  _domain=domain.com
-#  _domain_id=sdjkglgdfewsdfg
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-
-  if ! _azion_rest GET "intelligent_dns"; then
-    return 1
-  fi
-
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      # not valid
-      return 1
-    fi
-
-    if _contains "$response" "\"domain\":\"$h\""; then
-      _domain_id=$(echo "$response" | tr '{' "\n" | grep "\"domain\":\"$h\"" | _egrep_o "\"id\":[0-9]*" | _head_n 1 | cut -d : -f 2 | tr -d \")
-      _debug _domain_id "$_domain_id"
-      if [ "$_domain_id" ]; then
-        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
-        _domain=$h
-        return 0
-      fi
-      return 1
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_get_record() {
-  _domain_id=$1
-  _record=$2
-
-  if ! _azion_rest GET "intelligent_dns/$_domain_id/records"; then
-    return 1
-  fi
-
-  if _contains "$response" "\"entry\":\"$_record\""; then
-    _json_record=$(echo "$response" | tr '{' "\n" | grep "\"entry\":\"$_record\"")
-    if [ "$_json_record" ]; then
-      record_id=$(echo "$_json_record" | _egrep_o "\"record_id\":[0-9]*" | _head_n 1 | cut -d : -f 2 | tr -d \")
-      answers_list=$(echo "$_json_record" | _egrep_o "\"answers_list\":\[.*\]" | _head_n 1 | cut -d : -f 2 | tr -d \[\])
-      return 0
-    fi
-    return 1
-  fi
-  return 1
-}
-
-_get_token() {
-  AZION_Email="${AZION_Email:-$(_readaccountconf_mutable AZION_Email)}"
-  AZION_Password="${AZION_Password:-$(_readaccountconf_mutable AZION_Password)}"
-
-  if ! _contains "$AZION_Email" "@"; then
-    _err "It seems that the AZION_Email is not a valid email address. Revalidate your environments."
-    return 1
-  fi
-
-  if [ -z "$AZION_Email" ] || [ -z "$AZION_Password" ]; then
-    _err "You didn't specified a AZION_Email/AZION_Password to generate Azion token."
-    return 1
-  fi
-
-  _saveaccountconf_mutable AZION_Email "$AZION_Email"
-  _saveaccountconf_mutable AZION_Password "$AZION_Password"
-
-  _basic_auth=$(printf "%s:%s" "$AZION_Email" "$AZION_Password" | _base64)
-  _debug _basic_auth "$_basic_auth"
-
-  export _H1="Accept: application/json; version=3"
-  export _H2="Content-Type: application/json"
-  export _H3="Authorization: Basic $_basic_auth"
-
-  response="$(_post "" "$AZION_Api/tokens" "" "POST")"
-  if _contains "$response" "\"token\":\"" >/dev/null; then
-    _azion_token=$(echo "$response" | _egrep_o "\"token\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \")
-    export AZION_Token="$_azion_token"
-  else
-    _err "Failed to generate Azion token"
-    return 1
-  fi
-}
-
-_azion_rest() {
-  _method=$1
-  _uri="$2"
-  _data="$3"
-
-  if [ -z "$AZION_Token" ]; then
-    _get_token
-  fi
-  _debug2 token "$AZION_Token"
-
-  export _H1="Accept: application/json; version=3"
-  export _H2="Content-Type: application/json"
-  export _H3="Authorization: token $AZION_Token"
-
-  if [ "$_method" != "GET" ]; then
-    _debug _data "$_data"
-    response="$(_post "$_data" "$AZION_Api/$_uri" "" "$_method")"
-  else
-    response="$(_get "$AZION_Api/$_uri")"
-  fi
-
-  _debug2 response "$response"
-
-  if [ "$?" != "0" ]; then
-    _err "error $_method $_uri $_data"
-    return 1
-  fi
-  return 0
-}

dnsapi/dns_azure.sh

@@ -1,91 +1,65 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_azure_info='Azure
-Site: Azure.microsoft.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_azure
-Options:
- AZUREDNS_SUBSCRIPTIONID Subscription ID
- AZUREDNS_TENANTID Tenant ID
- AZUREDNS_APPID App ID. App ID of the service principal
- AZUREDNS_CLIENTSECRET Client Secret. Secret from creating the service principal
- AZUREDNS_MANAGEDIDENTITY Use Managed Identity. Use Managed Identity assigned to a resource instead of a service principal. "true"/"false"
-'
 
-wiki=https://github.com/acmesh-official/acme.sh/wiki/How-to-use-Azure-DNS
+WIKI="https://github.com/acmesh-official/acme.sh/wiki/How-to-use-Azure-DNS"
 
 ########  Public functions #####################
 
 # Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 # Used to add txt record
 #
-# Ref: https://learn.microsoft.com/en-us/rest/api/dns/record-sets/create-or-update?view=rest-dns-2018-05-01&tabs=HTTP
+# Ref: https://docs.microsoft.com/en-us/rest/api/dns/recordsets/createorupdate
 #
-
 dns_azure_add() {
   fulldomain=$1
   txtvalue=$2
 
   AZUREDNS_SUBSCRIPTIONID="${AZUREDNS_SUBSCRIPTIONID:-$(_readaccountconf_mutable AZUREDNS_SUBSCRIPTIONID)}"
+  AZUREDNS_TENANTID="${AZUREDNS_TENANTID:-$(_readaccountconf_mutable AZUREDNS_TENANTID)}"
+  AZUREDNS_APPID="${AZUREDNS_APPID:-$(_readaccountconf_mutable AZUREDNS_APPID)}"
+  AZUREDNS_CLIENTSECRET="${AZUREDNS_CLIENTSECRET:-$(_readaccountconf_mutable AZUREDNS_CLIENTSECRET)}"
+
   if [ -z "$AZUREDNS_SUBSCRIPTIONID" ]; then
     AZUREDNS_SUBSCRIPTIONID=""
     AZUREDNS_TENANTID=""
     AZUREDNS_APPID=""
     AZUREDNS_CLIENTSECRET=""
-    _err "You didn't specify the Azure Subscription ID"
+    _err "You didn't specify the Azure Subscription ID "
     return 1
   fi
-  #save subscription id to account conf file.
-  _saveaccountconf_mutable AZUREDNS_SUBSCRIPTIONID "$AZUREDNS_SUBSCRIPTIONID"
 
-  AZUREDNS_MANAGEDIDENTITY="${AZUREDNS_MANAGEDIDENTITY:-$(_readaccountconf_mutable AZUREDNS_MANAGEDIDENTITY)}"
-  if [ "$AZUREDNS_MANAGEDIDENTITY" = true ]; then
-    _info "Using Azure managed identity"
-    #save managed identity as preferred authentication method, clear service principal credentials from conf file.
-    _saveaccountconf_mutable AZUREDNS_MANAGEDIDENTITY "$AZUREDNS_MANAGEDIDENTITY"
-    _saveaccountconf_mutable AZUREDNS_TENANTID ""
-    _saveaccountconf_mutable AZUREDNS_APPID ""
-    _saveaccountconf_mutable AZUREDNS_CLIENTSECRET ""
-  else
-    _info "You didn't ask to use Azure managed identity, checking service principal credentials"
-    AZUREDNS_TENANTID="${AZUREDNS_TENANTID:-$(_readaccountconf_mutable AZUREDNS_TENANTID)}"
-    AZUREDNS_APPID="${AZUREDNS_APPID:-$(_readaccountconf_mutable AZUREDNS_APPID)}"
-    AZUREDNS_CLIENTSECRET="${AZUREDNS_CLIENTSECRET:-$(_readaccountconf_mutable AZUREDNS_CLIENTSECRET)}"
-
-    if [ -z "$AZUREDNS_TENANTID" ]; then
-      AZUREDNS_SUBSCRIPTIONID=""
-      AZUREDNS_TENANTID=""
-      AZUREDNS_APPID=""
-      AZUREDNS_CLIENTSECRET=""
-      _err "You didn't specify the Azure Tenant ID "
-      return 1
-    fi
-
-    if [ -z "$AZUREDNS_APPID" ]; then
-      AZUREDNS_SUBSCRIPTIONID=""
-      AZUREDNS_TENANTID=""
-      AZUREDNS_APPID=""
-      AZUREDNS_CLIENTSECRET=""
-      _err "You didn't specify the Azure App ID"
-      return 1
-    fi
-
-    if [ -z "$AZUREDNS_CLIENTSECRET" ]; then
-      AZUREDNS_SUBSCRIPTIONID=""
-      AZUREDNS_TENANTID=""
-      AZUREDNS_APPID=""
-      AZUREDNS_CLIENTSECRET=""
-      _err "You didn't specify the Azure Client Secret"
-      return 1
-    fi
-
-    #save account details to account conf file, don't opt in for azure manages identity check.
-    _saveaccountconf_mutable AZUREDNS_MANAGEDIDENTITY "false"
-    _saveaccountconf_mutable AZUREDNS_TENANTID "$AZUREDNS_TENANTID"
-    _saveaccountconf_mutable AZUREDNS_APPID "$AZUREDNS_APPID"
-    _saveaccountconf_mutable AZUREDNS_CLIENTSECRET "$AZUREDNS_CLIENTSECRET"
+  if [ -z "$AZUREDNS_TENANTID" ]; then
+    AZUREDNS_SUBSCRIPTIONID=""
+    AZUREDNS_TENANTID=""
+    AZUREDNS_APPID=""
+    AZUREDNS_CLIENTSECRET=""
+    _err "You didn't specify the Azure Tenant ID "
+    return 1
   fi
 
-  accesstoken=$(_azure_getaccess_token "$AZUREDNS_MANAGEDIDENTITY" "$AZUREDNS_TENANTID" "$AZUREDNS_APPID" "$AZUREDNS_CLIENTSECRET")
+  if [ -z "$AZUREDNS_APPID" ]; then
+    AZUREDNS_SUBSCRIPTIONID=""
+    AZUREDNS_TENANTID=""
+    AZUREDNS_APPID=""
+    AZUREDNS_CLIENTSECRET=""
+    _err "You didn't specify the Azure App ID"
+    return 1
+  fi
+
+  if [ -z "$AZUREDNS_CLIENTSECRET" ]; then
+    AZUREDNS_SUBSCRIPTIONID=""
+    AZUREDNS_TENANTID=""
+    AZUREDNS_APPID=""
+    AZUREDNS_CLIENTSECRET=""
+    _err "You didn't specify the Azure Client Secret"
+    return 1
+  fi
+  #save account details to account conf file.
+  _saveaccountconf_mutable AZUREDNS_SUBSCRIPTIONID "$AZUREDNS_SUBSCRIPTIONID"
+  _saveaccountconf_mutable AZUREDNS_TENANTID "$AZUREDNS_TENANTID"
+  _saveaccountconf_mutable AZUREDNS_APPID "$AZUREDNS_APPID"
+  _saveaccountconf_mutable AZUREDNS_CLIENTSECRET "$AZUREDNS_CLIENTSECRET"
+
+  accesstoken=$(_azure_getaccess_token "$AZUREDNS_TENANTID" "$AZUREDNS_APPID" "$AZUREDNS_CLIENTSECRET")
 
   if ! _get_root "$fulldomain" "$AZUREDNS_SUBSCRIPTIONID" "$accesstoken"; then
     _err "invalid domain"
@@ -135,13 +109,17 @@ dns_azure_add() {
 # Usage: fulldomain txtvalue
 # Used to remove the txt record after validation
 #
-# Ref: https://learn.microsoft.com/en-us/rest/api/dns/record-sets/delete?view=rest-dns-2018-05-01&tabs=HTTP
+# Ref: https://docs.microsoft.com/en-us/rest/api/dns/recordsets/delete
 #
 dns_azure_rm() {
   fulldomain=$1
   txtvalue=$2
 
   AZUREDNS_SUBSCRIPTIONID="${AZUREDNS_SUBSCRIPTIONID:-$(_readaccountconf_mutable AZUREDNS_SUBSCRIPTIONID)}"
+  AZUREDNS_TENANTID="${AZUREDNS_TENANTID:-$(_readaccountconf_mutable AZUREDNS_TENANTID)}"
+  AZUREDNS_APPID="${AZUREDNS_APPID:-$(_readaccountconf_mutable AZUREDNS_APPID)}"
+  AZUREDNS_CLIENTSECRET="${AZUREDNS_CLIENTSECRET:-$(_readaccountconf_mutable AZUREDNS_CLIENTSECRET)}"
+
   if [ -z "$AZUREDNS_SUBSCRIPTIONID" ]; then
     AZUREDNS_SUBSCRIPTIONID=""
     AZUREDNS_TENANTID=""
@@ -151,44 +129,34 @@ dns_azure_rm() {
     return 1
   fi
 
-  AZUREDNS_MANAGEDIDENTITY="${AZUREDNS_MANAGEDIDENTITY:-$(_readaccountconf_mutable AZUREDNS_MANAGEDIDENTITY)}"
-  if [ "$AZUREDNS_MANAGEDIDENTITY" = true ]; then
-    _info "Using Azure managed identity"
-  else
-    _info "You didn't ask to use Azure managed identity, checking service principal credentials"
-    AZUREDNS_TENANTID="${AZUREDNS_TENANTID:-$(_readaccountconf_mutable AZUREDNS_TENANTID)}"
-    AZUREDNS_APPID="${AZUREDNS_APPID:-$(_readaccountconf_mutable AZUREDNS_APPID)}"
-    AZUREDNS_CLIENTSECRET="${AZUREDNS_CLIENTSECRET:-$(_readaccountconf_mutable AZUREDNS_CLIENTSECRET)}"
-
-    if [ -z "$AZUREDNS_TENANTID" ]; then
-      AZUREDNS_SUBSCRIPTIONID=""
-      AZUREDNS_TENANTID=""
-      AZUREDNS_APPID=""
-      AZUREDNS_CLIENTSECRET=""
-      _err "You didn't specify the Azure Tenant ID "
-      return 1
-    fi
-
-    if [ -z "$AZUREDNS_APPID" ]; then
-      AZUREDNS_SUBSCRIPTIONID=""
-      AZUREDNS_TENANTID=""
-      AZUREDNS_APPID=""
-      AZUREDNS_CLIENTSECRET=""
-      _err "You didn't specify the Azure App ID"
-      return 1
-    fi
-
-    if [ -z "$AZUREDNS_CLIENTSECRET" ]; then
-      AZUREDNS_SUBSCRIPTIONID=""
-      AZUREDNS_TENANTID=""
-      AZUREDNS_APPID=""
-      AZUREDNS_CLIENTSECRET=""
-      _err "You didn't specify the Azure Client Secret"
-      return 1
-    fi
+  if [ -z "$AZUREDNS_TENANTID" ]; then
+    AZUREDNS_SUBSCRIPTIONID=""
+    AZUREDNS_TENANTID=""
+    AZUREDNS_APPID=""
+    AZUREDNS_CLIENTSECRET=""
+    _err "You didn't specify the Azure Tenant ID "
+    return 1
   fi
 
-  accesstoken=$(_azure_getaccess_token "$AZUREDNS_MANAGEDIDENTITY" "$AZUREDNS_TENANTID" "$AZUREDNS_APPID" "$AZUREDNS_CLIENTSECRET")
+  if [ -z "$AZUREDNS_APPID" ]; then
+    AZUREDNS_SUBSCRIPTIONID=""
+    AZUREDNS_TENANTID=""
+    AZUREDNS_APPID=""
+    AZUREDNS_CLIENTSECRET=""
+    _err "You didn't specify the Azure App ID"
+    return 1
+  fi
+
+  if [ -z "$AZUREDNS_CLIENTSECRET" ]; then
+    AZUREDNS_SUBSCRIPTIONID=""
+    AZUREDNS_TENANTID=""
+    AZUREDNS_APPID=""
+    AZUREDNS_CLIENTSECRET=""
+    _err "You didn't specify the Azure Client Secret"
+    return 1
+  fi
+
+  accesstoken=$(_azure_getaccess_token "$AZUREDNS_TENANTID" "$AZUREDNS_APPID" "$AZUREDNS_CLIENTSECRET")
 
   if ! _get_root "$fulldomain" "$AZUREDNS_SUBSCRIPTIONID" "$accesstoken"; then
     _err "invalid domain"
@@ -267,10 +235,10 @@ _azure_rest() {
     if [ "$_code" = "401" ]; then
       # we have an invalid access token set to expired
       _saveaccountconf_mutable AZUREDNS_TOKENVALIDTO "0"
-      _err "Access denied. Invalid access token. Make sure your Azure settings are correct. See: $wiki"
+      _err "access denied make sure your Azure settings are correct. See $WIKI"
       return 1
     fi
-    # See https://learn.microsoft.com/en-us/azure/architecture/best-practices/retry-service-specific#general-rest-and-retry-guidelines for retryable HTTP codes
+    # See https://docs.microsoft.com/en-us/azure/architecture/best-practices/retry-service-specific#general-rest-and-retry-guidelines for retryable HTTP codes
     if [ "$_ret" != "0" ] || [ -z "$_code" ] || [ "$_code" = "408" ] || [ "$_code" = "500" ] || [ "$_code" = "503" ] || [ "$_code" = "504" ]; then
       _request_retry_times="$(_math "$_request_retry_times" + 1)"
       _info "REST call error $_code retrying $ep in $_request_retry_times s"
@@ -288,12 +256,11 @@ _azure_rest() {
   return 0
 }
 
-## Ref: https://learn.microsoft.com/en-us/entra/identity-platform/v2-oauth2-client-creds-grant-flow#request-an-access-token
+## Ref: https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-protocols-oauth-service-to-service#request-an-access-token
 _azure_getaccess_token() {
-  managedIdentity=$1
-  tenantID=$2
-  clientID=$3
-  clientSecret=$4
+  tenantID=$1
+  clientID=$2
+  clientSecret=$3
 
   accesstoken="${AZUREDNS_BEARERTOKEN:-$(_readaccountconf_mutable AZUREDNS_BEARERTOKEN)}"
   expires_on="${AZUREDNS_TOKENVALIDTO:-$(_readaccountconf_mutable AZUREDNS_TOKENVALIDTO)}"
@@ -311,28 +278,20 @@ _azure_getaccess_token() {
   fi
   _debug "getting new bearer token"
 
-  if [ "$managedIdentity" = true ]; then
-    # https://learn.microsoft.com/en-us/entra/identity/managed-identities-azure-resources/how-to-use-vm-token#get-a-token-using-http
-    export _H1="Metadata: true"
-    response="$(_get http://169.254.169.254/metadata/identity/oauth2/token\?api-version=2018-02-01\&resource=https://management.azure.com/)"
-    response="$(echo "$response" | _normalizeJson)"
-    accesstoken=$(echo "$response" | _egrep_o "\"access_token\":\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \")
-    expires_on=$(echo "$response" | _egrep_o "\"expires_on\":\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \")
-  else
-    export _H1="accept: application/json"
-    export _H2="Content-Type: application/x-www-form-urlencoded"
-    body="resource=$(printf "%s" 'https://management.core.windows.net/' | _url_encode)&client_id=$(printf "%s" "$clientID" | _url_encode)&client_secret=$(printf "%s" "$clientSecret" | _url_encode)&grant_type=client_credentials"
-    _secure_debug2 "data $body"
-    response="$(_post "$body" "https://login.microsoftonline.com/$tenantID/oauth2/token" "" "POST")"
-    _ret="$?"
-    _secure_debug2 "response $response"
-    response="$(echo "$response" | _normalizeJson)"
-    accesstoken=$(echo "$response" | _egrep_o "\"access_token\":\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \")
-    expires_on=$(echo "$response" | _egrep_o "\"expires_on\":\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \")
-  fi
+  export _H1="accept: application/json"
+  export _H2="Content-Type: application/x-www-form-urlencoded"
+
+  body="resource=$(printf "%s" 'https://management.core.windows.net/' | _url_encode)&client_id=$(printf "%s" "$clientID" | _url_encode)&client_secret=$(printf "%s" "$clientSecret" | _url_encode)&grant_type=client_credentials"
+  _secure_debug2 "data $body"
+  response="$(_post "$body" "https://login.microsoftonline.com/$tenantID/oauth2/token" "" "POST")"
+  _ret="$?"
+  _secure_debug2 "response $response"
+  response="$(echo "$response" | _normalizeJson)"
+  accesstoken=$(echo "$response" | _egrep_o "\"access_token\":\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \")
+  expires_on=$(echo "$response" | _egrep_o "\"expires_on\":\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \")
 
   if [ -z "$accesstoken" ]; then
-    _err "No acccess token received. Check your Azure settings. See: $wiki"
+    _err "no acccess token received. Check your Azure settings see $WIKI"
     return 1
   fi
   if [ "$_ret" != "0" ]; then
@@ -352,18 +311,15 @@ _get_root() {
   i=1
   p=1
 
-  ## Ref: https://learn.microsoft.com/en-us/rest/api/dns/zones/list?view=rest-dns-2018-05-01&tabs=HTTP
-  ## returns up to 100 zones in one response. Handling more results is not implemented
-  ## (ZoneListResult with continuation token for the next page of results)
-  ##
-  ## TODO: handle more than 100 results, as per:
-  ## https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/azure-subscription-service-limits#azure-dns-limits
-  ## The new limit is 250 Public DNS zones per subscription, while the old limit was only 100
+  ## Ref: https://docs.microsoft.com/en-us/rest/api/dns/zones/list
+  ## returns up to 100 zones in one response therefore handling more results is not not implemented
+  ## (ZoneListResult with  continuation token for the next page of results)
+  ## Per https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits#dns-limits you are limited to 100 Zone/subscriptions anyways
   ##
   _azure_rest GET "https://management.azure.com/subscriptions/$subscriptionId/providers/Microsoft.Network/dnszones?\$top=500&api-version=2017-09-01" "" "$accesstoken"
   # Find matching domain name in Json response
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug2 "Checking domain: $h"
     if [ -z "$h" ]; then
       #not valid
@@ -378,7 +334,7 @@ _get_root() {
           #create the record at the domain apex (@) if only the domain name was provided as --domain-alias
           _sub_domain="@"
         else
-          _sub_domain=$(echo "$domain" | cut -d . -f 1-"$p")
+          _sub_domain=$(echo "$domain" | cut -d . -f 1-$p)
         fi
         _domain=$h
         return 0

dnsapi/dns_bookmyname.sh

@@ -1,88 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_bookmyname_info='BookMyName.com
-Site: BookMyName.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_bookmyname
-Options:
- BOOKMYNAME_USERNAME Username
- BOOKMYNAME_PASSWORD Password
-Issues: github.com/acmesh-official/acme.sh/issues/3209
-Author: Neilpang
-'
-
-########  Public functions #####################
-
-# BookMyName urls:
-# https://BOOKMYNAME_USERNAME:BOOKMYNAME_PASSWORD@www.bookmyname.com/dyndns/?hostname=_acme-challenge.domain.tld&type=txt&ttl=300&do=add&value="XXXXXXXX"'
-# https://BOOKMYNAME_USERNAME:BOOKMYNAME_PASSWORD@www.bookmyname.com/dyndns/?hostname=_acme-challenge.domain.tld&type=txt&ttl=300&do=remove&value="XXXXXXXX"'
-
-# Output:
-#good: update done, cid 123456, domain id 456789, type txt, ip XXXXXXXX
-#good: remove done 1, cid 123456, domain id 456789, ttl 300, type txt, ip XXXXXXXX
-
-# Be careful, BMN DNS servers can be slow to pick up changes; using dnssleep is thus advised.
-
-# Usage:
-# export BOOKMYNAME_USERNAME="ABCDE-FREE"
-# export BOOKMYNAME_PASSWORD="MyPassword"
-# /usr/local/ssl/acme.sh/acme.sh --dns dns_bookmyname --dnssleep 600 --issue -d domain.tld
-
-#Usage: dns_bookmyname_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_bookmyname_add() {
-  fulldomain=$1
-  txtvalue=$2
-  _info "Using bookmyname"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  BOOKMYNAME_USERNAME="${BOOKMYNAME_USERNAME:-$(_readaccountconf_mutable BOOKMYNAME_USERNAME)}"
-  BOOKMYNAME_PASSWORD="${BOOKMYNAME_PASSWORD:-$(_readaccountconf_mutable BOOKMYNAME_PASSWORD)}"
-
-  if [ -z "$BOOKMYNAME_USERNAME" ] || [ -z "$BOOKMYNAME_PASSWORD" ]; then
-    BOOKMYNAME_USERNAME=""
-    BOOKMYNAME_PASSWORD=""
-    _err "You didn't specify BookMyName username and password yet."
-    _err "Please specify them and try again."
-    return 1
-  fi
-
-  #save the credentials to the account conf file.
-  _saveaccountconf_mutable BOOKMYNAME_USERNAME "$BOOKMYNAME_USERNAME"
-  _saveaccountconf_mutable BOOKMYNAME_PASSWORD "$BOOKMYNAME_PASSWORD"
-
-  uri="https://${BOOKMYNAME_USERNAME}:${BOOKMYNAME_PASSWORD}@www.bookmyname.com/dyndns/"
-  data="?hostname=${fulldomain}&type=TXT&ttl=300&do=add&value=${txtvalue}"
-  result="$(_get "${uri}${data}")"
-  _debug "Result: $result"
-
-  if ! _startswith "$result" 'good: update done, cid '; then
-    _err "Can't add $fulldomain"
-    return 1
-  fi
-
-}
-
-#Usage: fulldomain txtvalue
-#Remove the txt record after validation.
-dns_bookmyname_rm() {
-  fulldomain=$1
-  txtvalue=$2
-  _info "Using bookmyname"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  BOOKMYNAME_USERNAME="${BOOKMYNAME_USERNAME:-$(_readaccountconf_mutable BOOKMYNAME_USERNAME)}"
-  BOOKMYNAME_PASSWORD="${BOOKMYNAME_PASSWORD:-$(_readaccountconf_mutable BOOKMYNAME_PASSWORD)}"
-
-  uri="https://${BOOKMYNAME_USERNAME}:${BOOKMYNAME_PASSWORD}@www.bookmyname.com/dyndns/"
-  data="?hostname=${fulldomain}&type=TXT&ttl=300&do=remove&value=${txtvalue}"
-  result="$(_get "${uri}${data}")"
-  _debug "Result: $result"
-
-  if ! _startswith "$result" 'good: remove done 1, cid '; then
-    _info "Can't remove $fulldomain"
-  fi
-
-}
-
-####################  Private functions below ##################################

dnsapi/dns_bunny.sh

@@ -1,245 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_bunny_info='Bunny.net
-Site: Bunny.net/dns/
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_bunny
-Options:
- BUNNY_API_KEY API Key
-Issues: github.com/acmesh-official/acme.sh/issues/4296
-Author: <nosilver4u@ewww.io>
-'
-
-#####################  Public functions  #####################
-
-## Create the text record for validation.
-## Usage: fulldomain txtvalue
-## EG: "_acme-challenge.www.other.domain.com" "XKrxpRBosdq0HG9i01zxXp5CPBs"
-dns_bunny_add() {
-  fulldomain="$(echo "$1" | _lower_case)"
-  txtvalue=$2
-
-  BUNNY_API_KEY="${BUNNY_API_KEY:-$(_readaccountconf_mutable BUNNY_API_KEY)}"
-  # Check if API Key is set
-  if [ -z "$BUNNY_API_KEY" ]; then
-    BUNNY_API_KEY=""
-    _err "You did not specify Bunny.net API key."
-    _err "Please export BUNNY_API_KEY and try again."
-    return 1
-  fi
-
-  _info "Using Bunny.net dns validation - add record"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  ## save the env vars (key and domain split location) for later automated use
-  _saveaccountconf_mutable BUNNY_API_KEY "$BUNNY_API_KEY"
-
-  ## split the domain for Bunny API
-  if ! _get_base_domain "$fulldomain"; then
-    _err "domain not found in your account for addition"
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-  _debug _domain_id "$_domain_id"
-
-  ## Set the header with our post type and auth key
-  export _H1="Accept: application/json"
-  export _H2="AccessKey: $BUNNY_API_KEY"
-  export _H3="Content-Type: application/json"
-  PURL="https://api.bunny.net/dnszone/$_domain_id/records"
-  PBODY='{"Id":'$_domain_id',"Type":3,"Name":"'$_sub_domain'","Value":"'$txtvalue'","ttl":120}'
-
-  _debug PURL "$PURL"
-  _debug PBODY "$PBODY"
-
-  ## the create request - POST
-  ## args: BODY, URL, [need64, httpmethod]
-  response="$(_post "$PBODY" "$PURL" "" "PUT")"
-
-  ## check response
-  if [ "$?" != "0" ]; then
-    _err "error in response: $response"
-    return 1
-  fi
-  _debug2 response "$response"
-
-  ## finished correctly
-  return 0
-}
-
-## Remove the txt record after validation.
-## Usage: fulldomain txtvalue
-## EG: "_acme-challenge.www.other.domain.com" "XKrxpRBosdq0HG9i01zxXp5CPBs"
-dns_bunny_rm() {
-  fulldomain="$(echo "$1" | _lower_case)"
-  txtvalue=$2
-
-  BUNNY_API_KEY="${BUNNY_API_KEY:-$(_readaccountconf_mutable BUNNY_API_KEY)}"
-  # Check if API Key Exists
-  if [ -z "$BUNNY_API_KEY" ]; then
-    BUNNY_API_KEY=""
-    _err "You did not specify Bunny.net API key."
-    _err "Please export BUNNY_API_KEY and try again."
-    return 1
-  fi
-
-  _info "Using Bunny.net dns validation - remove record"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  ## split the domain for Bunny API
-  if ! _get_base_domain "$fulldomain"; then
-    _err "Domain not found in your account for TXT record removal"
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-  _debug _domain_id "$_domain_id"
-
-  ## Set the header with our post type and key auth key
-  export _H1="Accept: application/json"
-  export _H2="AccessKey: $BUNNY_API_KEY"
-  ## get URL for the list of DNS records
-  GURL="https://api.bunny.net/dnszone/$_domain_id"
-
-  ## 1) Get the domain/zone records
-  ## the fetch request - GET
-  ## args: URL, [onlyheader, timeout]
-  domain_list="$(_get "$GURL")"
-
-  ## check response
-  if [ "$?" != "0" ]; then
-    _err "error in domain_list response: $domain_list"
-    return 1
-  fi
-  _debug2 domain_list "$domain_list"
-
-  ## 2) search through records
-  ## check for what we are looking for: "Type":3,"Value":"$txtvalue","Name":"$_sub_domain"
-  record="$(echo "$domain_list" | _egrep_o "\"Id\"\s*\:\s*\"*[0-9]+\"*,\s*\"Type\"[^}]*\"Value\"\s*\:\s*\"$txtvalue\"[^}]*\"Name\"\s*\:\s*\"$_sub_domain\"")"
-
-  if [ -n "$record" ]; then
-
-    ## We found records
-    rec_ids="$(echo "$record" | _egrep_o "Id\"\s*\:\s*\"*[0-9]+" | _egrep_o "[0-9]+")"
-    _debug rec_ids "$rec_ids"
-    if [ -n "$rec_ids" ]; then
-      echo "$rec_ids" | while IFS= read -r rec_id; do
-        ## delete the record
-        ## delete URL for removing the one we dont want
-        DURL="https://api.bunny.net/dnszone/$_domain_id/records/$rec_id"
-
-        ## the removal request - DELETE
-        ## args: BODY, URL, [need64, httpmethod]
-        response="$(_post "" "$DURL" "" "DELETE")"
-
-        ## check response (sort of)
-        if [ "$?" != "0" ]; then
-          _err "error in remove response: $response"
-          return 1
-        fi
-        _debug2 response "$response"
-
-      done
-    fi
-  fi
-
-  ## finished correctly
-  return 0
-}
-
-#####################  Private functions below  #####################
-
-## Split the domain provided into the "base domain" and the "start prefix".
-## This function searches for the longest subdomain in your account
-## for the full domain given and splits it into the base domain (zone)
-## and the prefix/record to be added/removed
-## USAGE: fulldomain
-## EG: "_acme-challenge.two.three.four.domain.com"
-## returns
-## _sub_domain="_acme-challenge.two"
-## _domain="three.four.domain.com" *IF* zone "three.four.domain.com" exists
-## _domain_id=234
-## if only "domain.com" exists it will return
-## _sub_domain="_acme-challenge.two.three.four"
-## _domain="domain.com"
-## _domain_id=234
-_get_base_domain() {
-  # args
-  fulldomain="$(echo "$1" | _lower_case)"
-  _debug fulldomain "$fulldomain"
-
-  # domain max legal length = 253
-  MAX_DOM=255
-  page=1
-
-  ## get a list of domains for the account to check thru
-  ## Set the headers
-  export _H1="Accept: application/json"
-  export _H2="AccessKey: $BUNNY_API_KEY"
-  _debug BUNNY_API_KEY "$BUNNY_API_KEY"
-  ## get URL for the list of domains
-  ## may get: "links":{"pages":{"last":".../v2/domains/DOM/records?page=2","next":".../v2/domains/DOM/records?page=2"}}
-  DOMURL="https://api.bunny.net/dnszone"
-
-  ## while we dont have a matching domain we keep going
-  while [ -z "$found" ]; do
-    ## get the domain list (current page)
-    domain_list="$(_get "$DOMURL")"
-
-    ## check response
-    if [ "$?" != "0" ]; then
-      _err "error in domain_list response: $domain_list"
-      return 1
-    fi
-    _debug2 domain_list "$domain_list"
-
-    i=1
-    while [ "$i" -gt 0 ]; do
-      ## get next longest domain
-      _domain=$(printf "%s" "$fulldomain" | cut -d . -f "$i"-"$MAX_DOM")
-      ## check we got something back from our cut (or are we at the end)
-      if [ -z "$_domain" ]; then
-        break
-      fi
-      ## we got part of a domain back - grep it out
-      found="$(echo "$domain_list" | _egrep_o "\"Id\"\s*:\s*\"*[0-9]+\"*,\s*\"Domain\"\s*\:\s*\"$_domain\"")"
-      ## check if it exists
-      if [ -n "$found" ]; then
-        ## exists - exit loop returning the parts
-        sub_point=$(_math "$i" - 1)
-        _sub_domain=$(printf "%s" "$fulldomain" | cut -d . -f 1-"$sub_point")
-        _domain_id="$(echo "$found" | _egrep_o "Id\"\s*\:\s*\"*[0-9]+" | _egrep_o "[0-9]+")"
-        _debug _domain_id "$_domain_id"
-        _debug _domain "$_domain"
-        _debug _sub_domain "$_sub_domain"
-        found=""
-        return 0
-      fi
-      ## increment cut point $i
-      i=$(_math "$i" + 1)
-    done
-
-    if [ -z "$found" ]; then
-      page=$(_math "$page" + 1)
-      nextpage="https://api.bunny.net/dnszone?page=$page"
-      ## Find the next page if we don't have a match.
-      hasnextpage="$(echo "$domain_list" | _egrep_o "\"HasMoreItems\"\s*:\s*true")"
-      if [ -z "$hasnextpage" ]; then
-        _err "No record and no nextpage in Bunny.net domain search."
-        found=""
-        return 1
-      fi
-      _debug2 nextpage "$nextpage"
-      DOMURL="$nextpage"
-    fi
-
-  done
-
-  ## We went through the entire domain zone list and didn't find one that matched.
-  ## If we ever get here, something is broken in the code...
-  _err "Domain not found in Bunny.net account, but we should never get here!"
-  found=""
-  return 1
-}

dnsapi/dns_cf.sh

@@ -1,16 +1,13 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_cf_info='CloudFlare
-Site: CloudFlare.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_cf
-Options:
- CF_Key API Key
- CF_Email Your account email
-OptionsAlt:
- CF_Token API Token
- CF_Account_ID Account ID
- CF_Zone_ID Zone ID. Optional.
-'
+
+#
+#CF_Key="sdfsdfsdfljlbjkljlkjsdfoiwje"
+#
+#CF_Email="xxxx@sss.com"
+
+#CF_Token="xxxx"
+#CF_Account_ID="xxxx"
+#CF_Zone_ID="xxxx"
 
 CF_Api="https://api.cloudflare.com/client/v4"
 
@@ -28,16 +25,9 @@ dns_cf_add() {
   CF_Email="${CF_Email:-$(_readaccountconf_mutable CF_Email)}"
 
   if [ "$CF_Token" ]; then
-    if [ "$CF_Zone_ID" ]; then
-      _savedomainconf CF_Token "$CF_Token"
-      _savedomainconf CF_Account_ID "$CF_Account_ID"
-      _savedomainconf CF_Zone_ID "$CF_Zone_ID"
-    else
-      _saveaccountconf_mutable CF_Token "$CF_Token"
-      _saveaccountconf_mutable CF_Account_ID "$CF_Account_ID"
-      _clearaccountconf_mutable CF_Zone_ID
-      _clearaccountconf CF_Zone_ID
-    fi
+    _saveaccountconf_mutable CF_Token "$CF_Token"
+    _saveaccountconf_mutable CF_Account_ID "$CF_Account_ID"
+    _saveaccountconf_mutable CF_Zone_ID "$CF_Zone_ID"
   else
     if [ -z "$CF_Key" ] || [ -z "$CF_Email" ]; then
       CF_Key=""
@@ -55,14 +45,6 @@ dns_cf_add() {
     #save the api key and email to the account conf file.
     _saveaccountconf_mutable CF_Key "$CF_Key"
     _saveaccountconf_mutable CF_Email "$CF_Email"
-
-    _clearaccountconf_mutable CF_Token
-    _clearaccountconf_mutable CF_Account_ID
-    _clearaccountconf_mutable CF_Zone_ID
-    _clearaccountconf CF_Token
-    _clearaccountconf CF_Account_ID
-    _clearaccountconf CF_Zone_ID
-
   fi
 
   _debug "First detect the root zone"
@@ -186,7 +168,7 @@ _get_root() {
   fi
 
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug h "$h"
     if [ -z "$h" ]; then
       #not valid
@@ -206,7 +188,7 @@ _get_root() {
     if _contains "$response" "\"name\":\"$h\"" || _contains "$response" '"total_count":1'; then
       _domain_id=$(echo "$response" | _egrep_o "\[.\"id\": *\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \" | tr -d " ")
       if [ "$_domain_id" ]; then
-        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
         _domain=$h
         return 0
       fi

dnsapi/dns_clouddns.sh

@@ -1,15 +1,10 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_clouddns_info='vshosting.cz CloudDNS
-Site: github.com/vshosting/clouddns
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_clouddns
-Options:
- CLOUDDNS_EMAIL Email
- CLOUDDNS_PASSWORD Password
- CLOUDDNS_CLIENT_ID Client ID
-Issues: github.com/acmesh-official/acme.sh/issues/2699
-Author: Radek Sprta <sprta@vshosting.cz>
-'
+
+# Author: Radek Sprta <sprta@vshosting.cz>
+
+#CLOUDDNS_EMAIL=XXXXX
+#CLOUDDNS_PASSWORD="YYYYYYYYY"
+#CLOUDDNS_CLIENT_ID=XXXXX
 
 CLOUDDNS_API='https://admin.vshosting.cloud/clouddns'
 CLOUDDNS_LOGIN_API='https://admin.vshosting.cloud/api/public/auth/login'

dnsapi/dns_cloudns.sh

@@ -1,18 +1,12 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_cloudns_info='ClouDNS.net
-Site: ClouDNS.net
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_cloudns
-Options:
- CLOUDNS_AUTH_ID Regular auth ID
- CLOUDNS_SUB_AUTH_ID Sub auth ID
- CLOUDNS_AUTH_PASSWORD Auth Password
-Author: Boyan Peychev <boyan@cloudns.net>
-'
 
+# Author: Boyan Peychev <boyan at cloudns dot net>
+# Repository: https://github.com/ClouDNS/acme.sh/
+
+#CLOUDNS_AUTH_ID=XXXXX
+#CLOUDNS_SUB_AUTH_ID=XXXXX
+#CLOUDNS_AUTH_PASSWORD="YYYYYYYYY"
 CLOUDNS_API="https://api.cloudns.net"
-DOMAIN_TYPE=
-DOMAIN_MASTER=
 
 ########  Public functions #####################
 
@@ -67,21 +61,12 @@ dns_cloudns_rm() {
   host="$(echo "$1" | sed "s/\.$zone\$//")"
   record=$2
 
-  _dns_cloudns_get_zone_info "$zone"
-
-  _debug "Type" "$DOMAIN_TYPE"
-  _debug "Cloud Master" "$DOMAIN_MASTER"
-  if _contains "$DOMAIN_TYPE" "cloud"; then
-    zone=$DOMAIN_MASTER
-  fi
-  _debug "ZONE" "$zone"
-
   _dns_cloudns_http_api_call "dns/records.json" "domain-name=$zone&host=$host&type=TXT"
   if ! _contains "$response" "\"id\":"; then
     return 1
   fi
 
-  for i in $(echo "$response" | tr '{' "\n" | grep -- "$record"); do
+  for i in $(echo "$response" | tr '{' "\n" | grep "$record"); do
     record_id=$(echo "$i" | tr ',' "\n" | grep -E '^"id"' | sed -re 's/^\"id\"\:\"([0-9]+)\"$/\1/g')
 
     if [ -n "$record_id" ]; then
@@ -149,22 +134,10 @@ _dns_cloudns_init_check() {
   return 0
 }
 
-_dns_cloudns_get_zone_info() {
-  zone=$1
-  _dns_cloudns_http_api_call "dns/get-zone-info.json" "domain-name=$zone"
-  if ! _contains "$response" "\"status\":\"Failed\""; then
-    DOMAIN_TYPE=$(echo "$response" | _egrep_o '"type":"[^"]*"' | cut -d : -f 2 | tr -d '"')
-    if _contains "$DOMAIN_TYPE" "cloud"; then
-      DOMAIN_MASTER=$(echo "$response" | _egrep_o '"cloud-master":"[^"]*"' | cut -d : -f 2 | tr -d '"')
-    fi
-  fi
-  return 0
-}
-
 _dns_cloudns_get_zone_name() {
   i=2
   while true; do
-    zoneForCheck=$(printf "%s" "$1" | cut -d . -f "$i"-100)
+    zoneForCheck=$(printf "%s" "$1" | cut -d . -f $i-100)
 
     if [ -z "$zoneForCheck" ]; then
       return 1

dnsapi/dns_cn.sh

@@ -1,14 +1,7 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_cn_info='Core-Networks.de
-Site: beta.api.Core-Networks.de/doc/
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_cn
-Options:
- CN_User User
- CN_Password Password
-Issues: github.com/acmesh-official/acme.sh/issues/2142
-Author: 5ll, francis
-'
+
+# DNS API for acme.sh for Core-Networks (https://beta.api.core-networks.de/doc/).
+# created by 5ll and francis
 
 CN_API="https://beta.api.core-networks.de"
 
@@ -131,7 +124,7 @@ _cn_get_root() {
   p=1
   while true; do
 
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug h "$h"
     _debug _H1 "${_H1}"
 
@@ -149,7 +142,7 @@ _cn_get_root() {
     fi
 
     if _contains "$_cn_zonelist" "\"name\":\"$h\"" >/dev/null; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       _domain=$h
       return 0
     else

dnsapi/dns_conoha.sh

@@ -1,15 +1,4 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_conoha_info='ConoHa.jp
-Domains: ConoHa.io
-Site: ConoHa.jp
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_conoha
-Options:
- CONOHA_Username Username
- CONOHA_Password Password
- CONOHA_TenantId TenantId
- CONOHA_IdentityServiceApi Identity Service API. E.g. "https://identity.xxxx.conoha.io/v2.0"
-'
 
 CONOHA_DNS_EP_PREFIX_REGEXP="https://dns-service\."
 
@@ -237,7 +226,7 @@ _get_root() {
   i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100).
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100).
     _debug h "$h"
     if [ -z "$h" ]; then
       #not valid
@@ -251,7 +240,7 @@ _get_root() {
     if _contains "$response" "\"name\":\"$h\"" >/dev/null; then
       _domain_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":\"[^\"]*\"" | head -n 1 | cut -d : -f 2 | tr -d \")
       if [ "$_domain_id" ]; then
-        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
         _domain=$h
         return 0
       fi

dnsapi/dns_constellix.sh

@@ -1,16 +1,10 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_constellix_info='Constellix.com
-Site: Constellix.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_constellix
-Options:
- CONSTELLIX_Key API Key
- CONSTELLIX_Secret API Secret
-Issues: github.com/acmesh-official/acme.sh/issues/2724
-Author: Wout Decre <wout@canodus.be>
-'
+
+# Author: Wout Decre <wout@canodus.be>
 
 CONSTELLIX_Api="https://api.dns.constellix.com/v1"
+#CONSTELLIX_Key="XXX"
+#CONSTELLIX_Secret="XXX"
 
 ########  Public functions #####################
 
@@ -36,41 +30,16 @@ dns_constellix_add() {
     return 1
   fi
 
-  # The TXT record might already exist when working with wildcard certificates. In that case, update the record by adding the new value.
-  _debug "Search TXT record"
-  if _constellix_rest GET "domains/${_domain_id}/records/TXT/search?exact=${_sub_domain}"; then
-    if printf -- "%s" "$response" | grep "{\"errors\":\[\"Requested record was not found\"\]}" >/dev/null; then
-      _info "Adding TXT record"
-      if _constellix_rest POST "domains/${_domain_id}/records" "[{\"type\":\"txt\",\"add\":true,\"set\":{\"name\":\"${_sub_domain}\",\"ttl\":60,\"roundRobin\":[{\"value\":\"${txtvalue}\"}]}}]"; then
-        if printf -- "%s" "$response" | grep "{\"success\":\"1 record(s) added, 0 record(s) updated, 0 record(s) deleted\"}" >/dev/null; then
-          _info "Added"
-          return 0
-        else
-          _err "Error adding TXT record"
-        fi
-      fi
+  _info "Adding TXT record"
+  if _constellix_rest POST "domains/${_domain_id}/records" "[{\"type\":\"txt\",\"add\":true,\"set\":{\"name\":\"${_sub_domain}\",\"ttl\":120,\"roundRobin\":[{\"value\":\"${txtvalue}\"}]}}]"; then
+    if printf -- "%s" "$response" | grep "{\"success\":\"1 record(s) added, 0 record(s) updated, 0 record(s) deleted\"}" >/dev/null; then
+      _info "Added"
+      return 0
     else
-      _record_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":[0-9]*" | cut -d ':' -f 2)
-      if _constellix_rest GET "domains/${_domain_id}/records/TXT/${_record_id}"; then
-        _new_rr_values=$(printf "%s\n" "$response" | _egrep_o '"roundRobin":\[[^]]*\]' | sed "s/\]$/,{\"value\":\"${txtvalue}\"}]/")
-        _debug _new_rr_values "$_new_rr_values"
-        _info "Updating TXT record"
-        if _constellix_rest PUT "domains/${_domain_id}/records/TXT/${_record_id}" "{\"name\":\"${_sub_domain}\",\"ttl\":60,${_new_rr_values}}"; then
-          if printf -- "%s" "$response" | grep "{\"success\":\"Record.*updated successfully\"}" >/dev/null; then
-            _info "Updated"
-            return 0
-          elif printf -- "%s" "$response" | grep "{\"errors\":\[\"Contents are identical\"\]}" >/dev/null; then
-            _info "Already exists, no need to update"
-            return 0
-          else
-            _err "Error updating TXT record"
-          fi
-        fi
-      fi
+      _err "Error adding TXT record"
+      return 1
     fi
   fi
-
-  return 1
 }
 
 # Usage: fulldomain txtvalue
@@ -92,26 +61,16 @@ dns_constellix_rm() {
     return 1
   fi
 
-  # The TXT record might have been removed already when working with some wildcard certificates.
-  _debug "Search TXT record"
-  if _constellix_rest GET "domains/${_domain_id}/records/TXT/search?exact=${_sub_domain}"; then
-    if printf -- "%s" "$response" | grep "{\"errors\":\[\"Requested record was not found\"\]}" >/dev/null; then
+  _info "Removing TXT record"
+  if _constellix_rest POST "domains/${_domain_id}/records" "[{\"type\":\"txt\",\"delete\":true,\"filter\":{\"field\":\"name\",\"op\":\"eq\",\"value\":\"${_sub_domain}\"}}]"; then
+    if printf -- "%s" "$response" | grep "{\"success\":\"0 record(s) added, 0 record(s) updated, 1 record(s) deleted\"}" >/dev/null; then
       _info "Removed"
       return 0
     else
-      _info "Removing TXT record"
-      if _constellix_rest POST "domains/${_domain_id}/records" "[{\"type\":\"txt\",\"delete\":true,\"filter\":{\"field\":\"name\",\"op\":\"eq\",\"value\":\"${_sub_domain}\"}}]"; then
-        if printf -- "%s" "$response" | grep "{\"success\":\"0 record(s) added, 0 record(s) updated, 1 record(s) deleted\"}" >/dev/null; then
-          _info "Removed"
-          return 0
-        else
-          _err "Error removing TXT record"
-        fi
-      fi
+      _err "Error removing TXT record"
+      return 1
     fi
   fi
-
-  return 1
 }
 
 ####################  Private functions below ##################################
@@ -122,7 +81,7 @@ _get_root() {
   p=1
   _debug "Detecting root zone"
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     if [ -z "$h" ]; then
       return 1
     fi
@@ -132,9 +91,9 @@ _get_root() {
     fi
 
     if _contains "$response" "\"name\":\"$h\""; then
-      _domain_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":[0-9]*" | cut -d ':' -f 2)
+      _domain_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":[0-9]+" | cut -d ':' -f 2)
       if [ "$_domain_id" ]; then
-        _sub_domain=$(printf "%s" "$domain" | cut -d '.' -f 1-"$p")
+        _sub_domain=$(printf "%s" "$domain" | cut -d '.' -f 1-$p)
         _domain="$h"
 
         _debug _domain_id "$_domain_id"

dnsapi/dns_cpanel.sh

@@ -1,160 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_cpanel_info='cPanel Server API
- Manage DNS via cPanel Dashboard.
-Site: cPanel.net
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_cpanel
-Options:
- cPanel_Username Username
- cPanel_Apitoken API Token
- cPanel_Hostname Server URL. E.g. "https://hostname:port"
-Issues: github.com/acmesh-official/acme.sh/issues/3732
-Author: Bjarne Saltbaek
-'
-
-########  Public functions #####################
-
-# Used to add txt record
-dns_cpanel_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _info "Adding TXT record to cPanel based system"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-  _debug cPanel_Username "$cPanel_Username"
-  _debug cPanel_Apitoken "$cPanel_Apitoken"
-  _debug cPanel_Hostname "$cPanel_Hostname"
-
-  if ! _cpanel_login; then
-    _err "cPanel Login failed for user $cPanel_Username. Check $HTTP_HEADER file"
-    return 1
-  fi
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "No matching root domain for $fulldomain found"
-    return 1
-  fi
-  # adding entry
-  _info "Adding the entry"
-  stripped_fulldomain=$(echo "$fulldomain" | sed "s/.$_domain//")
-  _debug "Adding $stripped_fulldomain to $_domain zone"
-  _myget "json-api/cpanel?cpanel_jsonapi_apiversion=2&cpanel_jsonapi_module=ZoneEdit&cpanel_jsonapi_func=add_zone_record&domain=$_domain&name=$stripped_fulldomain&type=TXT&txtdata=$txtvalue&ttl=1"
-  if _successful_update; then return 0; fi
-  _err "Couldn't create entry!"
-  return 1
-}
-
-# Usage: fulldomain txtvalue
-# Used to remove the txt record after validation
-dns_cpanel_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _info "Using cPanel based system"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  if ! _cpanel_login; then
-    _err "cPanel Login failed for user $cPanel_Username. Check $HTTP_HEADER file"
-    return 1
-  fi
-
-  if ! _get_root; then
-    _err "No matching root domain for $fulldomain found"
-    return 1
-  fi
-
-  _findentry "$fulldomain" "$txtvalue"
-  if [ -z "$_id" ]; then
-    _info "Entry doesn't exist, nothing to delete"
-    return 0
-  fi
-  _debug "Deleting record..."
-  _myget "json-api/cpanel?cpanel_jsonapi_apiversion=2&cpanel_jsonapi_module=ZoneEdit&cpanel_jsonapi_func=remove_zone_record&domain=$_domain&line=$_id"
-  # removing entry
-  _debug "_result is: $_result"
-
-  if _successful_update; then return 0; fi
-  _err "Couldn't delete entry!"
-  return 1
-}
-
-####################  Private functions below ##################################
-
-_checkcredentials() {
-  cPanel_Username="${cPanel_Username:-$(_readaccountconf_mutable cPanel_Username)}"
-  cPanel_Apitoken="${cPanel_Apitoken:-$(_readaccountconf_mutable cPanel_Apitoken)}"
-  cPanel_Hostname="${cPanel_Hostname:-$(_readaccountconf_mutable cPanel_Hostname)}"
-
-  if [ -z "$cPanel_Username" ] || [ -z "$cPanel_Apitoken" ] || [ -z "$cPanel_Hostname" ]; then
-    cPanel_Username=""
-    cPanel_Apitoken=""
-    cPanel_Hostname=""
-    _err "You haven't specified cPanel username, apitoken and hostname yet."
-    _err "Please add credentials and try again."
-    return 1
-  fi
-  #save the credentials to the account conf file.
-  _saveaccountconf_mutable cPanel_Username "$cPanel_Username"
-  _saveaccountconf_mutable cPanel_Apitoken "$cPanel_Apitoken"
-  _saveaccountconf_mutable cPanel_Hostname "$cPanel_Hostname"
-  return 0
-}
-
-_cpanel_login() {
-  if ! _checkcredentials; then return 1; fi
-
-  if ! _myget "json-api/cpanel?cpanel_jsonapi_apiversion=2&cpanel_jsonapi_module=CustInfo&cpanel_jsonapi_func=displaycontactinfo"; then
-    _err "cPanel login failed for user $cPanel_Username."
-    return 1
-  fi
-  return 0
-}
-
-_myget() {
-  #Adds auth header to request
-  export _H1="Authorization: cpanel $cPanel_Username:$cPanel_Apitoken"
-  _result=$(_get "$cPanel_Hostname/$1")
-}
-
-_get_root() {
-  _myget 'json-api/cpanel?cpanel_jsonapi_apiversion=2&cpanel_jsonapi_module=ZoneEdit&cpanel_jsonapi_func=fetchzones'
-  _domains=$(echo "$_result" | _egrep_o '"[a-z0-9\.\-]*":\["; cPanel first' | cut -d':' -f1 | sed 's/"//g' | sed 's/{//g')
-  _debug "_result is: $_result"
-  _debug "_domains is: $_domains"
-  if [ -z "$_domains" ]; then
-    _err "Primary domain list not found!"
-    return 1
-  fi
-  for _domain in $_domains; do
-    _debug "Checking if $fulldomain ends with $_domain"
-    if (_endswith "$fulldomain" "$_domain"); then
-      _debug "Root domain: $_domain"
-      return 0
-    fi
-  done
-  return 1
-}
-
-_successful_update() {
-  if (echo "$_result" | _egrep_o 'data":\[[^]]*]' | grep -q '"newserial":null'); then return 1; fi
-  return 0
-}
-
-_findentry() {
-  _debug "In _findentry"
-  #returns id of dns entry, if it exists
-  _myget "json-api/cpanel?cpanel_jsonapi_apiversion=2&cpanel_jsonapi_module=ZoneEdit&cpanel_jsonapi_func=fetchzone_records&domain=$_domain"
-  _id=$(echo "$_result" | sed -e "s/},{/},\n{/g" | grep "$fulldomain" | grep "$txtvalue" | _egrep_o 'line":[0-9]+' | cut -d ':' -f 2)
-  _debug "_result is: $_result"
-  _debug "fulldomain. is $fulldomain."
-  _debug "txtvalue is $txtvalue"
-  _debug "_id is: $_id"
-  if [ -n "$_id" ]; then
-    _debug "Entry found with _id=$_id"
-    return 0
-  fi
-  return 1
-}

dnsapi/dns_curanet.sh

@@ -1,165 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_curanet_info='Curanet.dk
-Domains: scannet.dk wannafind.dk dandomain.dk
-Site: Curanet.dk
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_curanet
-Options:
- CURANET_AUTHCLIENTID Auth ClientID. Requires scope dns
- CURANET_AUTHSECRET Auth Secret
-Issues: github.com/acmesh-official/acme.sh/issues/3933
-Author: Peter L. Hansen <peter@r12.dk>
-'
-
-CURANET_REST_URL="https://api.curanet.dk/dns/v1/Domains"
-CURANET_AUTH_URL="https://apiauth.dk.team.blue/auth/realms/Curanet/protocol/openid-connect/token"
-CURANET_ACCESS_TOKEN=""
-
-########  Public functions #####################
-
-#Usage: dns_curanet_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_curanet_add() {
-  fulldomain=$1
-  txtvalue=$2
-  _info "Using curanet"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  CURANET_AUTHCLIENTID="${CURANET_AUTHCLIENTID:-$(_readaccountconf_mutable CURANET_AUTHCLIENTID)}"
-  CURANET_AUTHSECRET="${CURANET_AUTHSECRET:-$(_readaccountconf_mutable CURANET_AUTHSECRET)}"
-  if [ -z "$CURANET_AUTHCLIENTID" ] || [ -z "$CURANET_AUTHSECRET" ]; then
-    CURANET_AUTHCLIENTID=""
-    CURANET_AUTHSECRET=""
-    _err "You don't specify curanet api client and secret."
-    _err "Please create your auth info and try again."
-    return 1
-  fi
-
-  #save the credentials to the account conf file.
-  _saveaccountconf_mutable CURANET_AUTHCLIENTID "$CURANET_AUTHCLIENTID"
-  _saveaccountconf_mutable CURANET_AUTHSECRET "$CURANET_AUTHSECRET"
-
-  if ! _get_token; then
-    _err "Unable to get token"
-    return 1
-  fi
-
-  if ! _get_root "$fulldomain"; then
-    _err "Invalid domain"
-    return 1
-  fi
-
-  export _H1="Content-Type: application/json-patch+json"
-  export _H2="Accept: application/json"
-  export _H3="Authorization: Bearer $CURANET_ACCESS_TOKEN"
-  data="{\"name\": \"$fulldomain\",\"type\": \"TXT\",\"ttl\": 60,\"priority\": 0,\"data\": \"$txtvalue\"}"
-  response="$(_post "$data" "$CURANET_REST_URL/${_domain}/Records" "" "")"
-
-  if _contains "$response" "$txtvalue"; then
-    _debug "TXT record added OK"
-  else
-    _err "Unable to add TXT record"
-    return 1
-  fi
-
-  return 0
-}
-
-#Usage: fulldomain txtvalue
-#Remove the txt record after validation.
-dns_curanet_rm() {
-  fulldomain=$1
-  txtvalue=$2
-  _info "Using curanet"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  CURANET_AUTHCLIENTID="${CURANET_AUTHCLIENTID:-$(_readaccountconf_mutable CURANET_AUTHCLIENTID)}"
-  CURANET_AUTHSECRET="${CURANET_AUTHSECRET:-$(_readaccountconf_mutable CURANET_AUTHSECRET)}"
-
-  if ! _get_token; then
-    _err "Unable to get token"
-    return 1
-  fi
-
-  if ! _get_root "$fulldomain"; then
-    _err "Invalid domain"
-    return 1
-  fi
-
-  _debug "Getting current record list to identify TXT to delete"
-
-  export _H1="Content-Type: application/json"
-  export _H2="Accept: application/json"
-  export _H3="Authorization: Bearer $CURANET_ACCESS_TOKEN"
-
-  response="$(_get "$CURANET_REST_URL/${_domain}/Records" "" "")"
-
-  if ! _contains "$response" "$txtvalue"; then
-    _err "Unable to delete record (does not contain $txtvalue )"
-    return 1
-  fi
-
-  recordid=$(echo "$response" | _egrep_o "{\"id\":[0-9]+,\"name\":\"$fulldomain\",\"type\":\"TXT\",\"ttl\":60,\"priority\":0,\"data\":\"..$txtvalue" | _egrep_o "id\":[0-9]+" | cut -c 5-)
-
-  if [ -z "$recordid" ]; then
-    _err "Unable to get recordid"
-    _debug "regex {\"id\":[0-9]+,\"name\":\"$fulldomain\",\"type\":\"TXT\",\"ttl\":60,\"priority\":0,\"data\":\"..$txtvalue"
-    _debug "response $response"
-    return 1
-  fi
-
-  _debug "Deleting recordID $recordid"
-  response="$(_post "" "$CURANET_REST_URL/${_domain}/Records/$recordid" "" "DELETE")"
-  return 0
-}
-
-####################  Private functions below ##################################
-
-_get_token() {
-  response="$(_post "grant_type=client_credentials&client_id=$CURANET_AUTHCLIENTID&client_secret=$CURANET_AUTHSECRET&scope=dns" "$CURANET_AUTH_URL" "" "")"
-  if ! _contains "$response" "access_token"; then
-    _err "Unable get access token"
-    return 1
-  fi
-  CURANET_ACCESS_TOKEN=$(echo "$response" | _egrep_o "\"access_token\":\"[^\"]+" | cut -c 17-)
-
-  if [ -z "$CURANET_ACCESS_TOKEN" ]; then
-    _err "Unable to get token"
-    return 1
-  fi
-
-  return 0
-
-}
-
-#_acme-challenge.www.domain.com
-#returns
-# _domain=domain.com
-# _domain_id=sdjkglgdfewsdfg
-_get_root() {
-  domain=$1
-  i=1
-
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    export _H1="Content-Type: application/json"
-    export _H2="Accept: application/json"
-    export _H3="Authorization: Bearer $CURANET_ACCESS_TOKEN"
-    response="$(_get "$CURANET_REST_URL/$h/Records" "" "")"
-
-    if [ ! "$(echo "$response" | _egrep_o "Entity not found")" ]; then
-      _domain=$h
-      return 0
-    fi
-
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}

dnsapi/dns_cx.sh

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+# CloudXNS Domain api
+#
+#CX_Key="1234"
+#
+#CX_Secret="sADDsdasdgdsf"
+
+CX_Api="https://www.cloudxns.net/api2"
+
+#REST_API
+########  Public functions #####################
+
+#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+dns_cx_add() {
+  fulldomain=$1
+  txtvalue=$2
+
+  CX_Key="${CX_Key:-$(_readaccountconf_mutable CX_Key)}"
+  CX_Secret="${CX_Secret:-$(_readaccountconf_mutable CX_Secret)}"
+  if [ -z "$CX_Key" ] || [ -z "$CX_Secret" ]; then
+    CX_Key=""
+    CX_Secret=""
+    _err "You don't specify cloudxns.net  api key or secret yet."
+    _err "Please create you key and try again."
+    return 1
+  fi
+
+  REST_API="$CX_Api"
+
+  #save the api key and email to the account conf file.
+  _saveaccountconf_mutable CX_Key "$CX_Key"
+  _saveaccountconf_mutable CX_Secret "$CX_Secret"
+
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+
+  add_record "$_domain" "$_sub_domain" "$txtvalue"
+}
+
+#fulldomain txtvalue
+dns_cx_rm() {
+  fulldomain=$1
+  txtvalue=$2
+  CX_Key="${CX_Key:-$(_readaccountconf_mutable CX_Key)}"
+  CX_Secret="${CX_Secret:-$(_readaccountconf_mutable CX_Secret)}"
+  REST_API="$CX_Api"
+  if _get_root "$fulldomain"; then
+    record_id=""
+    existing_records "$_domain" "$_sub_domain" "$txtvalue"
+    if [ "$record_id" ]; then
+      _rest DELETE "record/$record_id/$_domain_id" "{}"
+      _info "Deleted record ${fulldomain}"
+    fi
+  fi
+}
+
+#usage:  root  sub
+#return if the sub record already exists.
+#echos the existing records count.
+# '0' means doesn't exist
+existing_records() {
+  _debug "Getting txt records"
+  root=$1
+  sub=$2
+  if ! _rest GET "record/$_domain_id?:domain_id?host_id=0&offset=0&row_num=100"; then
+    return 1
+  fi
+
+  seg=$(printf "%s\n" "$response" | _egrep_o '"record_id":[^{]*host":"'"$_sub_domain"'"[^}]*\}')
+  _debug seg "$seg"
+  if [ -z "$seg" ]; then
+    return 0
+  fi
+
+  if printf "%s" "$response" | grep '"type":"TXT"' >/dev/null; then
+    record_id=$(printf "%s\n" "$seg" | _egrep_o '"record_id":"[^"]*"' | cut -d : -f 2 | tr -d \" | _head_n 1)
+    _debug record_id "$record_id"
+    return 0
+  fi
+
+}
+
+#add the txt record.
+#usage: root  sub  txtvalue
+add_record() {
+  root=$1
+  sub=$2
+  txtvalue=$3
+  fulldomain="$sub.$root"
+
+  _info "Adding record"
+
+  if ! _rest POST "record" "{\"domain_id\": $_domain_id, \"host\":\"$_sub_domain\", \"value\":\"$txtvalue\", \"type\":\"TXT\",\"ttl\":600, \"line_id\":1}"; then
+    return 1
+  fi
+
+  return 0
+}
+
+####################  Private functions below ##################################
+#_acme-challenge.www.domain.com
+#returns
+# _sub_domain=_acme-challenge.www
+# _domain=domain.com
+# _domain_id=sdjkglgdfewsdfg
+_get_root() {
+  domain=$1
+  i=2
+  p=1
+
+  if ! _rest GET "domain"; then
+    return 1
+  fi
+
+  while true; do
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
+    _debug h "$h"
+    if [ -z "$h" ]; then
+      #not valid
+      return 1
+    fi
+
+    if _contains "$response" "$h."; then
+      seg=$(printf "%s\n" "$response" | _egrep_o '"id":[^{]*"'"$h"'."[^}]*}')
+      _debug seg "$seg"
+      _domain_id=$(printf "%s\n" "$seg" | _egrep_o "\"id\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \")
+      _debug _domain_id "$_domain_id"
+      if [ "$_domain_id" ]; then
+        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
+        _debug _sub_domain "$_sub_domain"
+        _domain="$h"
+        _debug _domain "$_domain"
+        return 0
+      fi
+      return 1
+    fi
+    p="$i"
+    i=$(_math "$i" + 1)
+  done
+  return 1
+}
+
+#Usage: method  URI  data
+_rest() {
+  m=$1
+  ep="$2"
+  _debug ep "$ep"
+  url="$REST_API/$ep"
+  _debug url "$url"
+
+  cdate=$(date -u "+%Y-%m-%d %H:%M:%S UTC")
+  _debug cdate "$cdate"
+
+  data="$3"
+  _debug data "$data"
+
+  sec="$CX_Key$url$data$cdate$CX_Secret"
+  _debug sec "$sec"
+  hmac=$(printf "%s" "$sec" | _digest md5 hex)
+  _debug hmac "$hmac"
+
+  export _H1="API-KEY: $CX_Key"
+  export _H2="API-REQUEST-DATE: $cdate"
+  export _H3="API-HMAC: $hmac"
+  export _H4="Content-Type: application/json"
+
+  if [ "$data" ]; then
+    response="$(_post "$data" "$url" "" "$m")"
+  else
+    response="$(_get "$url")"
+  fi
+
+  if [ "$?" != "0" ]; then
+    _err "error $ep"
+    return 1
+  fi
+  _debug2 response "$response"
+
+  _contains "$response" '"code":1'
+
+}

dnsapi/dns_cyon.sh

@@ -1,15 +1,21 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_cyon_info='cyon.ch
-Site: cyon.ch
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_cyon
-Options:
- CY_Username Username
- CY_Password API Token
- CY_OTP_Secret OTP token. Only required if using 2FA
-Issues: github.com/noplanman/cyon-api/issues
-Author: Armando Lüscher <armando@noplanman.ch>
-'
+
+########
+# Custom cyon.ch DNS API for use with [acme.sh](https://github.com/acmesh-official/acme.sh)
+#
+# Usage: acme.sh --issue --dns dns_cyon -d www.domain.com
+#
+# Dependencies:
+# -------------
+# - oathtool (When using 2 Factor Authentication)
+#
+# Issues:
+# -------
+# Any issues / questions / suggestions can be posted here:
+# https://github.com/noplanman/cyon-api/issues
+#
+# Author: Armando Lüscher <armando@noplanman.ch>
+########
 
 dns_cyon_add() {
   _cyon_load_credentials &&
@@ -38,7 +44,7 @@ dns_cyon_rm() {
 _cyon_load_credentials() {
   # Convert loaded password to/from base64 as needed.
   if [ "${CY_Password_B64}" ]; then
-    CY_Password="$(printf "%s" "${CY_Password_B64}" | _dbase64)"
+    CY_Password="$(printf "%s" "${CY_Password_B64}" | _dbase64 "multiline")"
   elif [ "${CY_Password}" ]; then
     CY_Password_B64="$(printf "%s" "${CY_Password}" | _base64)"
   fi

dnsapi/dns_da.sh

@@ -1,14 +1,31 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_da_info='DirectAdmin Server API
-Site: DirectAdmin.com/api.php
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_da
-Options:
- DA_Api API Server URL. E.g. "https://remoteUser:remotePassword@da.domain.tld:8443"
- DA_Api_Insecure Insecure TLS. 0: check for cert validity, 1: always accept
-Issues: github.com/TigerP/acme.sh/issues
-'
-
+# -*- mode: sh; tab-width: 2; indent-tabs-mode: s; coding: utf-8 -*-
+# vim: et ts=2 sw=2
+#
+# DirectAdmin 1.41.0 API
+# The DirectAdmin interface has it's own Let's encrypt functionality, but this
+# script can be used to generate certificates for names which are not hosted on
+# DirectAdmin
+#
+# User must provide login data and URL to DirectAdmin incl. port.
+# You can create login key, by using the Login Keys function
+# ( https://da.example.com:8443/CMD_LOGIN_KEYS ), which only has access to
+# - CMD_API_DNS_CONTROL
+# - CMD_API_SHOW_DOMAINS
+#
+# See also https://www.directadmin.com/api.php and
+# https://www.directadmin.com/features.php?id=1298
+#
+# Report bugs to https://github.com/TigerP/acme.sh/issues
+#
+# Values to export:
+# export DA_Api="https://remoteUser:remotePassword@da.example.com:8443"
+# export DA_Api_Insecure=1
+#
+# Set DA_Api_Insecure to 1 for insecure and 0 for secure -> difference is
+# whether ssl cert is checked for validity (0) or whether it is just accepted
+# (1)
+#
 ########  Public functions #####################
 
 # Usage: dns_myapi_add  _acme-challenge.www.example.com  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
@@ -61,7 +78,7 @@ _get_root() {
   # response will contain "list[]=example.com&list[]=example.org"
   _da_api CMD_API_SHOW_DOMAINS "" "${domain}"
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug h "$h"
     if [ -z "$h" ]; then
       # not valid
@@ -69,7 +86,7 @@ _get_root() {
       return 1
     fi
     if _contains "$response" "$h" >/dev/null; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       _domain=$h
       return 0
     fi

dnsapi/dns_ddnss.sh

@@ -1,15 +1,18 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_ddnss_info='DDNSS.de
-Site: DDNSS.de
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_ddnss
-Options:
- DDNSS_Token API Token
-Issues: github.com/acmesh-official/acme.sh/issues/2230
-Author: RaidenII, helbgd, mod242
-'
 
-DDNSS_DNS_API="https://ddnss.de/upd.php"
+#Created by RaidenII, to use DuckDNS's API to add/remove text records
+#modified by helbgd @ 03/13/2018 to support ddnss.de
+#modified by mod242 @ 04/24/2018 to support different ddnss domains
+#Please note: the Wildcard Feature must be turned on for the Host record
+#and the checkbox for TXT needs to be enabled
+
+# Pass credentials before "acme.sh --issue --dns dns_ddnss ..."
+# --
+# export DDNSS_Token="aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
+# --
+#
+
+DDNSS_DNS_API="https://ip4.ddnss.de/upd.php"
 
 ########  Public functions #####################
 
@@ -74,7 +77,7 @@ dns_ddnss_rm() {
 
   # Now remove the TXT record from DDNS DNS
   _info "Trying to remove TXT record"
-  if _ddnss_rest GET "key=$DDNSS_Token&host=$_ddnss_domain&txtm=2"; then
+  if _ddnss_rest GET "key=$DDNSS_Token&host=$_ddnss_domain&txtm=1&txt=."; then
     if [ "$response" = "Updated 1 hostname." ]; then
       _info "TXT record has been successfully removed from your DDNSS domain."
       return 0

dnsapi/dns_desec.sh

@@ -1,13 +1,11 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_desec_info='deSEC.io
-Site: desec.readthedocs.io/en/latest/
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_desec
-Options:
- DDNSS_Token API Token
-Issues: github.com/acmesh-official/acme.sh/issues/2180
-Author: Zheng Qian
-'
+#
+# deSEC.io Domain API
+#
+# Author: Zheng Qian
+#
+# deSEC API doc
+# https://desec.readthedocs.io/en/latest/
 
 REST_API="https://desec.io/api/v1/domains"
 
@@ -22,17 +20,21 @@ dns_desec_add() {
   _debug txtvalue "$txtvalue"
 
   DEDYN_TOKEN="${DEDYN_TOKEN:-$(_readaccountconf_mutable DEDYN_TOKEN)}"
+  DEDYN_NAME="${DEDYN_NAME:-$(_readaccountconf_mutable DEDYN_NAME)}"
 
-  if [ -z "$DEDYN_TOKEN" ]; then
+  if [ -z "$DEDYN_TOKEN" ] || [ -z "$DEDYN_NAME" ]; then
     DEDYN_TOKEN=""
-    _err "You did not specify DEDYN_TOKEN yet."
+    DEDYN_NAME=""
+    _err "You did not specify DEDYN_TOKEN and DEDYN_NAME yet."
     _err "Please create your key and try again."
     _err "e.g."
     _err "export DEDYN_TOKEN=d41d8cd98f00b204e9800998ecf8427e"
+    _err "export DEDYN_NAME=foobar.dedyn.io"
     return 1
   fi
-  #save the api token to the account conf file.
+  #save the api token and name to the account conf file.
   _saveaccountconf_mutable DEDYN_TOKEN "$DEDYN_TOKEN"
+  _saveaccountconf_mutable DEDYN_NAME "$DEDYN_NAME"
 
   _debug "First detect the root zone"
   if ! _get_root "$fulldomain" "$REST_API/"; then
@@ -45,7 +47,7 @@ dns_desec_add() {
   # Get existing TXT record
   _debug "Getting txt records"
   txtvalues="\"\\\"$txtvalue\\\"\""
-  _desec_rest GET "$REST_API/$_domain/rrsets/$_sub_domain/TXT/"
+  _desec_rest GET "$REST_API/$DEDYN_NAME/rrsets/$_sub_domain/TXT/"
 
   if [ "$_code" = "200" ]; then
     oldtxtvalues="$(echo "$response" | _egrep_o "\"records\":\\[\"\\S*\"\\]" | cut -d : -f 2 | tr -d "[]\\\\\"" | sed "s/,/ /g")"
@@ -61,7 +63,7 @@ dns_desec_add() {
   _info "Adding record"
   body="[{\"subname\":\"$_sub_domain\", \"type\":\"TXT\", \"records\":[$txtvalues], \"ttl\":3600}]"
 
-  if _desec_rest PUT "$REST_API/$_domain/rrsets/" "$body"; then
+  if _desec_rest PUT "$REST_API/$DEDYN_NAME/rrsets/" "$body"; then
     if _contains "$response" "$txtvalue"; then
       _info "Added, OK"
       return 0
@@ -85,13 +87,16 @@ dns_desec_rm() {
   _debug txtvalue "$txtvalue"
 
   DEDYN_TOKEN="${DEDYN_TOKEN:-$(_readaccountconf_mutable DEDYN_TOKEN)}"
+  DEDYN_NAME="${DEDYN_NAME:-$(_readaccountconf_mutable DEDYN_NAME)}"
 
-  if [ -z "$DEDYN_TOKEN" ]; then
+  if [ -z "$DEDYN_TOKEN" ] || [ -z "$DEDYN_NAME" ]; then
     DEDYN_TOKEN=""
-    _err "You did not specify DEDYN_TOKEN yet."
+    DEDYN_NAME=""
+    _err "You did not specify DEDYN_TOKEN and DEDYN_NAME yet."
     _err "Please create your key and try again."
     _err "e.g."
     _err "export DEDYN_TOKEN=d41d8cd98f00b204e9800998ecf8427e"
+    _err "export DEDYN_NAME=foobar.dedyn.io"
     return 1
   fi
 
@@ -107,7 +112,7 @@ dns_desec_rm() {
   # Get existing TXT record
   _debug "Getting txt records"
   txtvalues=""
-  _desec_rest GET "$REST_API/$_domain/rrsets/$_sub_domain/TXT/"
+  _desec_rest GET "$REST_API/$DEDYN_NAME/rrsets/$_sub_domain/TXT/"
 
   if [ "$_code" = "200" ]; then
     oldtxtvalues="$(echo "$response" | _egrep_o "\"records\":\\[\"\\S*\"\\]" | cut -d : -f 2 | tr -d "[]\\\\\"" | sed "s/,/ /g")"
@@ -126,7 +131,7 @@ dns_desec_rm() {
 
   _info "Deleting record"
   body="[{\"subname\":\"$_sub_domain\", \"type\":\"TXT\", \"records\":[$txtvalues], \"ttl\":3600}]"
-  _desec_rest PUT "$REST_API/$_domain/rrsets/" "$body"
+  _desec_rest PUT "$REST_API/$DEDYN_NAME/rrsets/" "$body"
   if [ "$_code" = "200" ]; then
     _info "Deleted, OK"
     return 0
@@ -176,7 +181,7 @@ _get_root() {
   i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug h "$h"
     if [ -z "$h" ]; then
       #not valid
@@ -188,7 +193,7 @@ _get_root() {
     fi
 
     if _contains "$response" "\"name\":\"$h\"" >/dev/null; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       _domain=$h
       return 0
     fi

dnsapi/dns_df.sh

@@ -1,15 +1,18 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_df_info='DynDnsFree.de
-Domains: dynup.de
-Site: DynDnsFree.de
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_df
-Options:
- DF_user Username
- DF_password Password
-Issues: github.com/acmesh-official/acme.sh/issues/2897
-Author: Thilo Gass <thilo.gass@gmail.com>
-'
+
+########################################################################
+# https://dyndnsfree.de hook script for acme.sh
+#
+# Environment variables:
+#
+#  - $DF_user      (your dyndnsfree.de username)
+#  - $DF_password  (your dyndnsfree.de password)
+#
+# Author: Thilo Gass <thilo.gass@gmail.com>
+# Git repo: https://github.com/ThiloGa/acme.sh
+
+#-- dns_df_add() - Add TXT record --------------------------------------
+# Usage: dns_df_add _acme-challenge.subdomain.domain.com "XyZ123..."
 
 dyndnsfree_api="https://dynup.de/acme.php"
 

dnsapi/dns_dgon.sh

@@ -1,12 +1,16 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dgon_info='DigitalOcean.com
-Site: DigitalOcean.com/help/api/
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_dgon
-Options:
- DO_API_KEY API Key
-Author: <github@thewer.com>
-'
+
+## Will be called by acme.sh to add the txt record to your api system.
+## returns 0 means success, otherwise error.
+
+## Author: thewer <github at thewer.com>
+## GitHub: https://github.com/gitwer/acme.sh
+
+##
+## Environment Variables Required:
+##
+## DO_API_KEY="75310dc4ca779ac39a19f6355db573b49ce92ae126553ebd61ac3a3ae34834cc"
+##
 
 #####################  Public functions  #####################
 
@@ -188,7 +192,6 @@ _get_base_domain() {
   ## get URL for the list of domains
   ## may get: "links":{"pages":{"last":".../v2/domains/DOM/records?page=2","next":".../v2/domains/DOM/records?page=2"}}
   DOMURL="https://api.digitalocean.com/v2/domains"
-  found=""
 
   ## while we dont have a matching domain we keep going
   while [ -z "$found" ]; do
@@ -202,8 +205,10 @@ _get_base_domain() {
     fi
     _debug2 domain_list "$domain_list"
 
-    i=1
-    while [ "$i" -gt 0 ]; do
+    ## for each shortening of our $fulldomain, check if it exists in the $domain_list
+    ## can never start on 1 (aka whole $fulldomain) as $fulldomain starts with "_acme-challenge"
+    i=2
+    while [ $i -gt 0 ]; do
       ## get next longest domain
       _domain=$(printf "%s" "$fulldomain" | cut -d . -f "$i"-"$MAX_DOM")
       ## check we got something back from our cut (or are we at the end)
@@ -215,14 +220,14 @@ _get_base_domain() {
       ## check if it exists
       if [ -n "$found" ]; then
         ## exists - exit loop returning the parts
-        sub_point=$(_math "$i" - 1)
+        sub_point=$(_math $i - 1)
         _sub_domain=$(printf "%s" "$fulldomain" | cut -d . -f 1-"$sub_point")
         _debug _domain "$_domain"
         _debug _sub_domain "$_sub_domain"
         return 0
       fi
       ## increment cut point $i
-      i=$(_math "$i" + 1)
+      i=$(_math $i + 1)
     done
 
     if [ -z "$found" ]; then

dnsapi/dns_dnsexit.sh

@@ -1,188 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dnsexit_info='DNSExit.com
-Site: DNSExit.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_dnsexit
-Options:
- DNSEXIT_API_KEY API Key
- DNSEXIT_AUTH_USER Username
- DNSEXIT_AUTH_PASS Password
-Issues: github.com/acmesh-official/acme.sh/issues/4719
-Author: Samuel Jimenez
-'
-
-DNSEXIT_API_URL="https://api.dnsexit.com/dns/"
-DNSEXIT_HOSTS_URL="https://update.dnsexit.com/ipupdate/hosts.jsp"
-
-########  Public functions #####################
-#Usage: dns_dnsexit_add   _acme-challenge.*.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_dnsexit_add() {
-  fulldomain=$1
-  txtvalue=$2
-  _info "Using DNSExit.com"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  _debug 'Load account auth'
-  if ! get_account_info; then
-    return 1
-  fi
-
-  _debug 'First detect the root zone'
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  if ! _dnsexit_rest "{\"domain\":\"$_domain\",\"add\":{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":0,\"overwrite\":false}}"; then
-    _err "$response"
-    return 1
-  fi
-
-  _debug2 _response "$response"
-  return 0
-}
-
-#Usage: fulldomain txtvalue
-#Remove the txt record after validation.
-dns_dnsexit_rm() {
-  fulldomain=$1
-  txtvalue=$2
-  _info "Using DNSExit.com"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  _debug 'Load account auth'
-  if ! get_account_info; then
-    return 1
-  fi
-
-  _debug 'First detect the root zone'
-  if ! _get_root "$fulldomain"; then
-    _err "$response"
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  if ! _dnsexit_rest "{\"domain\":\"$_domain\",\"delete\":{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\"}}"; then
-    _err "$response"
-    return 1
-  fi
-
-  _debug2 _response "$response"
-  return 0
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-_get_root() {
-  domain=$1
-  i=1
-  while true; do
-    _domain=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
-    _debug h "$_domain"
-    if [ -z "$_domain" ]; then
-      return 1
-    fi
-
-    _debug login "$DNSEXIT_AUTH_USER"
-    _debug password "$DNSEXIT_AUTH_PASS"
-    _debug domain "$_domain"
-
-    _dnsexit_http "login=$DNSEXIT_AUTH_USER&password=$DNSEXIT_AUTH_PASS&domain=$_domain"
-
-    if _contains "$response" "0=$_domain"; then
-      _sub_domain="$(echo "$fulldomain" | sed "s/\\.$_domain\$//")"
-      return 0
-    else
-      _debug "Go to next level of $_domain"
-    fi
-    i=$(_math "$i" + 1)
-  done
-
-  return 1
-}
-
-_dnsexit_rest() {
-  m=POST
-  ep=""
-  data="$1"
-  _debug _dnsexit_rest "$ep"
-  _debug data "$data"
-
-  api_key_trimmed=$(echo "$DNSEXIT_API_KEY" | tr -d '"')
-
-  export _H1="apikey: $api_key_trimmed"
-  export _H2='Content-Type: application/json'
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$DNSEXIT_API_URL/$ep" "" "$m")"
-  else
-    response="$(_get "$DNSEXIT_API_URL/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "Error $ep"
-    return 1
-  fi
-
-  _debug2 response "$response"
-  return 0
-}
-
-_dnsexit_http() {
-  m=GET
-  param="$1"
-  _debug param "$param"
-  _debug get "$DNSEXIT_HOSTS_URL?$param"
-
-  response="$(_get "$DNSEXIT_HOSTS_URL?$param")"
-
-  _debug response "$response"
-
-  if [ "$?" != "0" ]; then
-    _err "Error $param"
-    return 1
-  fi
-
-  _debug2 response "$response"
-  return 0
-}
-
-get_account_info() {
-
-  DNSEXIT_API_KEY="${DNSEXIT_API_KEY:-$(_readaccountconf_mutable DNSEXIT_API_KEY)}"
-  if test -z "$DNSEXIT_API_KEY"; then
-    DNSEXIT_API_KEY=''
-    _err 'DNSEXIT_API_KEY was not exported'
-    return 1
-  fi
-
-  _saveaccountconf_mutable DNSEXIT_API_KEY "$DNSEXIT_API_KEY"
-
-  DNSEXIT_AUTH_USER="${DNSEXIT_AUTH_USER:-$(_readaccountconf_mutable DNSEXIT_AUTH_USER)}"
-  if test -z "$DNSEXIT_AUTH_USER"; then
-    DNSEXIT_AUTH_USER=""
-    _err 'DNSEXIT_AUTH_USER was not exported'
-    return 1
-  fi
-
-  _saveaccountconf_mutable DNSEXIT_AUTH_USER "$DNSEXIT_AUTH_USER"
-
-  DNSEXIT_AUTH_PASS="${DNSEXIT_AUTH_PASS:-$(_readaccountconf_mutable DNSEXIT_AUTH_PASS)}"
-  if test -z "$DNSEXIT_AUTH_PASS"; then
-    DNSEXIT_AUTH_PASS=""
-    _err 'DNSEXIT_AUTH_PASS was not exported'
-    return 1
-  fi
-
-  _saveaccountconf_mutable DNSEXIT_AUTH_PASS "$DNSEXIT_AUTH_PASS"
-
-  return 0
-}

dnsapi/dns_dnshome.sh

@@ -1,86 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dnshome_info='dnsHome.de
-Site: dnsHome.de
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_dnshome
-Options:
- DNSHOME_Subdomain Subdomain
- DNSHOME_SubdomainPassword Subdomain Password
-Issues: github.com/acmesh-official/acme.sh/issues/3819
-Author: dnsHome.de https://github.com/dnsHome-de
-'
-
-# Usage: add subdomain.ddnsdomain.tld "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-# Used to add txt record
-dns_dnshome_add() {
-  txtvalue=$2
-
-  DNSHOME_Subdomain="${DNSHOME_Subdomain:-$(_readdomainconf DNSHOME_Subdomain)}"
-  DNSHOME_SubdomainPassword="${DNSHOME_SubdomainPassword:-$(_readdomainconf DNSHOME_SubdomainPassword)}"
-
-  if [ -z "$DNSHOME_Subdomain" ] || [ -z "$DNSHOME_SubdomainPassword" ]; then
-    DNSHOME_Subdomain=""
-    DNSHOME_SubdomainPassword=""
-    _err "Please specify/export your dnsHome.de Subdomain and Password"
-    return 1
-  fi
-
-  #save the credentials to the account conf file.
-  _savedomainconf DNSHOME_Subdomain "$DNSHOME_Subdomain"
-  _savedomainconf DNSHOME_SubdomainPassword "$DNSHOME_SubdomainPassword"
-
-  DNSHOME_Api="https://$DNSHOME_Subdomain:$DNSHOME_SubdomainPassword@www.dnshome.de/dyndns.php"
-
-  _DNSHOME_rest POST "acme=add&txt=$txtvalue"
-  if ! echo "$response" | grep 'successfully' >/dev/null; then
-    _err "Error"
-    _err "$response"
-    return 1
-  fi
-
-  return 0
-}
-
-# Usage: txtvalue
-# Used to remove the txt record after validation
-dns_dnshome_rm() {
-  txtvalue=$2
-
-  DNSHOME_Subdomain="${DNSHOME_Subdomain:-$(_readdomainconf DNSHOME_Subdomain)}"
-  DNSHOME_SubdomainPassword="${DNSHOME_SubdomainPassword:-$(_readdomainconf DNSHOME_SubdomainPassword)}"
-
-  DNSHOME_Api="https://$DNSHOME_Subdomain:$DNSHOME_SubdomainPassword@www.dnshome.de/dyndns.php"
-
-  if [ -z "$DNSHOME_Subdomain" ] || [ -z "$DNSHOME_SubdomainPassword" ]; then
-    DNSHOME_Subdomain=""
-    DNSHOME_SubdomainPassword=""
-    _err "Please specify/export your dnsHome.de Subdomain and Password"
-    return 1
-  fi
-
-  _DNSHOME_rest POST "acme=rm&txt=$txtvalue"
-  if ! echo "$response" | grep 'successfully' >/dev/null; then
-    _err "Error"
-    _err "$response"
-    return 1
-  fi
-
-  return 0
-}
-
-####################  Private functions below ##################################
-_DNSHOME_rest() {
-  method=$1
-  data="$2"
-  _debug "$data"
-
-  _debug data "$data"
-  response="$(_post "$data" "$DNSHOME_Api" "" "$method")"
-
-  if [ "$?" != "0" ]; then
-    _err "error $data"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}

dnsapi/dns_dnsimple.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dnsimple_info='DNSimple.com
-Site: DNSimple.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_dnsimple
-Options:
- DNSimple_OAUTH_TOKEN OAuth Token
-Issues: github.com/pho3nixf1re/acme.sh/issues
-'
+
+# DNSimple domain api
+# https://github.com/pho3nixf1re/acme.sh/issues
+#
+# This is your oauth token which can be acquired on the account page. Please
+# note that this must be an _account_ token and not a _user_ token.
+# https://dnsimple.com/a/<your account id>/account/access_tokens
+# DNSimple_OAUTH_TOKEN="sdfsdfsdfljlbjkljlkjsdfoiwje"
 
 DNSimple_API="https://api.dnsimple.com/v2"
 
@@ -92,7 +92,7 @@ _get_root() {
   i=2
   previous=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     if [ -z "$h" ]; then
       # not valid
       return 1
@@ -105,7 +105,7 @@ _get_root() {
     if _contains "$response" 'not found'; then
       _debug "$h not found"
     else
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$previous")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$previous)
       _domain="$h"
 
       _debug _domain "$_domain"

dnsapi/dns_dnsservices.sh

@@ -1,251 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dnsservices_info='DNS.Services
-Site: DNS.Services
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_dnsservices
-Options:
- DnsServices_Username Username
- DnsServices_Password Password
-Issues: github.com/acmesh-official/acme.sh/issues/4152
-Author: Bjarke Bruun <bbruun@gmail.com>
-'
-
-DNSServices_API=https://dns.services/api
-
-########  Public functions #####################
-
-#Usage: dns_dnsservices_add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_dnsservices_add() {
-  fulldomain="$1"
-  txtvalue="$2"
-
-  _info "Using dns.services to create ACME DNS challenge"
-  _debug2 add_fulldomain "$fulldomain"
-  _debug2 add_txtvalue "$txtvalue"
-
-  # Read username/password from environment or .acme.sh/accounts.conf
-  DnsServices_Username="${DnsServices_Username:-$(_readaccountconf_mutable DnsServices_Username)}"
-  DnsServices_Password="${DnsServices_Password:-$(_readaccountconf_mutable DnsServices_Password)}"
-  if [ -z "$DnsServices_Username" ] || [ -z "$DnsServices_Password" ]; then
-    DnsServices_Username=""
-    DnsServices_Password=""
-    _err "You didn't specify dns.services api username and password yet."
-    _err "Set environment variables DnsServices_Username and DnsServices_Password"
-    return 1
-  fi
-
-  # Setup GET/POST/DELETE headers
-  _setup_headers
-
-  #save the credentials to the account conf file.
-  _saveaccountconf_mutable DnsServices_Username "$DnsServices_Username"
-  _saveaccountconf_mutable DnsServices_Password "$DnsServices_Password"
-
-  if ! _contains "$DnsServices_Username" "@"; then
-    _err "It seems that the username variable DnsServices_Username has not been set/left blank"
-    _err "or is not a valid email. Please correct and try again."
-    return 1
-  fi
-
-  if ! _get_root "${fulldomain}"; then
-    _err "Invalid domain ${fulldomain}"
-    return 1
-  fi
-
-  if ! createRecord "$fulldomain" "${txtvalue}"; then
-    _err "Error creating TXT record in domain $fulldomain in $rootZoneName"
-    return 1
-  fi
-
-  _debug2 challenge-created "Created $fulldomain"
-  return 0
-}
-
-#Usage: fulldomain txtvalue
-#Description: Remove the txt record after validation.
-dns_dnsservices_rm() {
-  fulldomain="$1"
-  txtvalue="$2"
-
-  _info "Using dns.services to remove DNS record $fulldomain TXT $txtvalue"
-  _debug rm_fulldomain "$fulldomain"
-  _debug rm_txtvalue "$txtvalue"
-
-  # Read username/password from environment or .acme.sh/accounts.conf
-  DnsServices_Username="${DnsServices_Username:-$(_readaccountconf_mutable DnsServices_Username)}"
-  DnsServices_Password="${DnsServices_Password:-$(_readaccountconf_mutable DnsServices_Password)}"
-  if [ -z "$DnsServices_Username" ] || [ -z "$DnsServices_Password" ]; then
-    DnsServices_Username=""
-    DnsServices_Password=""
-    _err "You didn't specify dns.services api username and password yet."
-    _err "Set environment variables DnsServices_Username and DnsServices_Password"
-    return 1
-  fi
-
-  # Setup GET/POST/DELETE headers
-  _setup_headers
-
-  if ! _get_root "${fulldomain}"; then
-    _err "Invalid domain ${fulldomain}"
-    return 1
-  fi
-
-  _debug2 rm_rootDomainInfo "found root domain $rootZoneName for $fulldomain"
-
-  if ! deleteRecord "${fulldomain}" "${txtvalue}"; then
-    _err "Error removing record: $fulldomain TXT ${txtvalue}"
-    return 1
-  fi
-
-  return 0
-}
-
-####################  Private functions below ##################################
-
-_setup_headers() {
-  # Set up API Headers for _get() and _post()
-  # The <function>_add or <function>_rm must have been called before to work
-
-  if [ -z "$DnsServices_Username" ] || [ -z "$DnsServices_Password" ]; then
-    _err "Could not setup BASIC authentication headers, they are missing"
-    return 1
-  fi
-
-  DnsServiceCredentials="$(printf "%s" "$DnsServices_Username:$DnsServices_Password" | _base64)"
-  export _H1="Authorization: Basic $DnsServiceCredentials"
-  export _H2="Content-Type: application/json"
-
-  # Just return if headers are set
-  return 0
-}
-
-_get_root() {
-  domain="$1"
-  _debug2 _get_root "Get the root domain of ${domain} for DNS API"
-
-  # Setup _get() and _post() headers
-  #_setup_headers
-
-  result=$(_H1="$_H1" _H2="$_H2" _get "$DNSServices_API/dns")
-  result2="$(printf "%s\n" "$result" | tr '[' '\n' | grep '"name"')"
-  result3="$(printf "%s\n" "$result2" | tr '}' '\n' | grep '"name"' | sed "s,^\,,,g" | sed "s,$,},g")"
-  useResult=""
-  _debug2 _get_root "Got the following root domain(s) $result"
-  _debug2 _get_root "- JSON: $result"
-
-  if [ "$(printf "%s\n" "$result" | tr '}' '\n' | grep -c '"name"')" -gt "1" ]; then
-    checkMultiZones="true"
-    _debug2 _get_root "- multiple zones found"
-  else
-    checkMultiZones="false"
-    _debug2 _get_root "- single zone found"
-  fi
-
-  # Find/isolate the root zone to work with in createRecord() and deleteRecord()
-  rootZone=""
-  if [ "$checkMultiZones" = "true" ]; then
-    #rootZone=$(for x in $(printf "%s" "${result3}" | tr ',' '\n' | sed -n 's/.*"name":"\(.*\)",.*/\1/p'); do if [ "$(echo "$domain" | grep "$x")" != "" ]; then echo "$x"; fi; done)
-    rootZone=$(for x in $(printf "%s\n" "${result3}" | tr ',' '\n' | grep name | cut -d'"' -f4); do if [ "$(echo "$domain" | grep "$x")" != "" ]; then echo "$x"; fi; done)
-    if [ "$rootZone" != "" ]; then
-      _debug2 _rootZone "- root zone for $domain is $rootZone"
-    else
-      _err "Could not find root zone for $domain, is it correctly typed?"
-      return 1
-    fi
-  else
-    rootZone=$(echo "$result" | tr '}' '\n' | _egrep_o '"name":"[^"]*' | cut -d'"' -f4)
-    _debug2 _get_root "- only found 1 domain in API: $rootZone"
-  fi
-
-  if [ -z "$rootZone" ]; then
-    _err "Could not find root domain for $domain - is it correctly typed?"
-    return 1
-  fi
-
-  # Make sure we use the correct API zone data
-  useResult="$(printf "%s\n" "${result3}" tr ',' '\n' | grep "$rootZone")"
-  _debug2 _useResult "useResult=$useResult"
-
-  # Setup variables used by other functions to communicate with DNS.Services API
-  #zoneInfo=$(printf "%s\n" "$useResult" | sed -E 's,.*(zones)(.*),\1\2,g' | sed -E 's,^(.*"name":")([^"]*)"(.*)$,\2,g')
-  zoneInfo=$(printf "%s\n" "$useResult" | tr ',' '\n' | grep '"name"' | cut -d'"' -f4)
-  rootZoneName="$rootZone"
-  subDomainName="$(printf "%s\n" "$domain" | sed "s,\.$rootZone,,g")"
-  subDomainNameClean="$(printf "%s\n" "$domain" | sed "s,_acme-challenge.,,g")"
-  rootZoneDomainID=$(printf "%s\n" "$useResult" | tr ',' '\n' | grep domain_id | cut -d'"' -f4)
-  rootZoneServiceID=$(printf "%s\n" "$useResult" | tr ',' '\n' | grep service_id | cut -d'"' -f4)
-
-  _debug2 _zoneInfo "Zone info from API  : $zoneInfo"
-  _debug2 _get_root "Root zone name      : $rootZoneName"
-  _debug2 _get_root "Root zone domain ID : $rootZoneDomainID"
-  _debug2 _get_root "Root zone service ID: $rootZoneServiceID"
-  _debug2 _get_root "Sub domain          : $subDomainName"
-
-  _debug _get_root "Found valid root domain $rootZone for $subDomainNameClean"
-  return 0
-}
-
-createRecord() {
-  fulldomain="$1"
-  txtvalue="$2"
-
-  # Get root domain information - needed for DNS.Services API communication
-  if [ -z "$rootZoneName" ] || [ -z "$rootZoneDomainID" ] || [ -z "$rootZoneServiceID" ]; then
-    _get_root "$fulldomain"
-  fi
-  if [ -z "$rootZoneName" ] || [ -z "$rootZoneDomainID" ] || [ -z "$rootZoneServiceID" ]; then
-    _err "Something happend - could not get the API zone information"
-    return 1
-  fi
-
-  _debug2 createRecord "CNAME TXT value is: $txtvalue"
-
-  # Prepare data to send to API
-  data="{\"name\":\"${fulldomain}\",\"type\":\"TXT\",\"content\":\"${txtvalue}\", \"ttl\":\"10\"}"
-
-  _debug2 createRecord "data to API: $data"
-  result=$(_post "$data" "$DNSServices_API/service/$rootZoneServiceID/dns/$rootZoneDomainID/records" "" "POST")
-  _debug2 createRecord "result from API: $result"
-
-  if [ "$(echo "$result" | _egrep_o "\"success\":true")" = "" ]; then
-    _err "Failed to create TXT record $fulldomain with content $txtvalue in zone $rootZoneName"
-    _err "$result"
-    return 1
-  fi
-
-  _info "Record \"$fulldomain TXT $txtvalue\" has been created"
-  return 0
-}
-
-deleteRecord() {
-  fulldomain="$1"
-  txtvalue="$2"
-
-  _log deleteRecord "Deleting $fulldomain TXT $txtvalue record"
-
-  if [ -z "$rootZoneName" ] || [ -z "$rootZoneDomainID" ] || [ -z "$rootZoneServiceID" ]; then
-    _get_root "$fulldomain"
-  fi
-
-  result="$(_H1="$_H1" _H2="$_H2" _get "$DNSServices_API/service/$rootZoneServiceID/dns/$rootZoneDomainID")"
-  #recordInfo="$(echo "$result" | sed -e 's/:{/:{\n/g' -e 's/},/\n},\n/g' | grep "${txtvalue}")"
-  #recordID="$(echo "$recordInfo" | sed -e 's/:{/:{\n/g' -e 's/},/\n},\n/g' | grep "${txtvalue}" | sed -E 's,.*(zones)(.*),\1\2,g' | sed -E 's,^(.*"id":")([^"]*)"(.*)$,\2,g')"
-  recordID="$(printf "%s\n" "$result" | tr '}' '\n' | grep -- "$txtvalue" | tr ',' '\n' | grep '"id"' | cut -d'"' -f4)"
-  _debug2 _recordID "recordID used for deletion of record: $recordID"
-
-  if [ -z "$recordID" ]; then
-    _info "Record $fulldomain TXT $txtvalue not found or already deleted"
-    return 0
-  else
-    _debug2 deleteRecord "Found recordID=$recordID"
-  fi
-
-  _debug2 deleteRecord "DELETE request $DNSServices_API/service/$rootZoneServiceID/dns/$rootZoneDomainID/records/$recordID"
-  _log "curl DELETE request $DNSServices_API/service/$rootZoneServiceID/dns/$rootZoneDomainID/records/$recordID"
-  result="$(_H1="$_H1" _H2="$_H2" _post "" "$DNSServices_API/service/$rootZoneServiceID/dns/$rootZoneDomainID/records/$recordID" "" "DELETE")"
-  _debug2 deleteRecord "API Delete result \"$result\""
-  _log "curl API Delete result \"$result\""
-
-  # Return OK regardless
-  return 0
-}

dnsapi/dns_do.sh

@@ -0,0 +1,148 @@
+#!/usr/bin/env sh
+
+# DNS API for Domain-Offensive / Resellerinterface / Domainrobot
+
+# Report bugs at https://github.com/seidler2547/acme.sh/issues
+
+# set these environment variables to match your customer ID and password:
+# DO_PID="KD-1234567"
+# DO_PW="cdfkjl3n2"
+
+DO_URL="https://soap.resellerinterface.de/"
+
+########  Public functions #####################
+
+#Usage: dns_myapi_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+dns_do_add() {
+  fulldomain=$1
+  txtvalue=$2
+  if _dns_do_authenticate; then
+    _info "Adding TXT record to ${_domain} as ${fulldomain}"
+    _dns_do_soap createRR origin "${_domain}" name "${fulldomain}" type TXT data "${txtvalue}" ttl 300
+    if _contains "${response}" '>success<'; then
+      return 0
+    fi
+    _err "Could not create resource record, check logs"
+  fi
+  return 1
+}
+
+#fulldomain
+dns_do_rm() {
+  fulldomain=$1
+  if _dns_do_authenticate; then
+    if _dns_do_list_rrs; then
+      _dns_do_had_error=0
+      for _rrid in ${_rr_list}; do
+        _info "Deleting resource record $_rrid for $_domain"
+        _dns_do_soap deleteRR origin "${_domain}" rrid "${_rrid}"
+        if ! _contains "${response}" '>success<'; then
+          _dns_do_had_error=1
+          _err "Could not delete resource record for ${_domain}, id ${_rrid}"
+        fi
+      done
+      return $_dns_do_had_error
+    fi
+  fi
+  return 1
+}
+
+####################  Private functions below ##################################
+_dns_do_authenticate() {
+  _info "Authenticating as ${DO_PID}"
+  _dns_do_soap authPartner partner "${DO_PID}" password "${DO_PW}"
+  if _contains "${response}" '>success<'; then
+    _get_root "$fulldomain"
+    _debug "_domain $_domain"
+    return 0
+  else
+    _err "Authentication failed, are DO_PID and DO_PW set correctly?"
+  fi
+  return 1
+}
+
+_dns_do_list_rrs() {
+  _dns_do_soap getRRList origin "${_domain}"
+  if ! _contains "${response}" 'SOAP-ENC:Array'; then
+    _err "getRRList origin ${_domain} failed"
+    return 1
+  fi
+  _rr_list="$(echo "${response}" |
+    tr -d "\n\r\t" |
+    sed -e 's/<item xsi:type="ns2:Map">/\n/g' |
+    grep ">$(_regexcape "$fulldomain")</value>" |
+    sed -e 's/<\/item>/\n/g' |
+    grep '>id</key><value' |
+    _egrep_o '>[0-9]{1,16}<' |
+    tr -d '><')"
+  [ "${_rr_list}" ]
+}
+
+_dns_do_soap() {
+  func="$1"
+  shift
+  # put the parameters to xml
+  body="<tns:${func} xmlns:tns=\"${DO_URL}\">"
+  while [ "$1" ]; do
+    _k="$1"
+    shift
+    _v="$1"
+    shift
+    body="$body<$_k>$_v</$_k>"
+  done
+  body="$body</tns:${func}>"
+  _debug2 "SOAP request ${body}"
+
+  # build SOAP XML
+  _xml='<?xml version="1.0" encoding="UTF-8"?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
+  <env:Body>'"$body"'</env:Body>
+</env:Envelope>'
+
+  # set SOAP headers
+  export _H1="SOAPAction: ${DO_URL}#${func}"
+
+  if ! response="$(_post "${_xml}" "${DO_URL}")"; then
+    _err "Error <$1>"
+    return 1
+  fi
+  _debug2 "SOAP response $response"
+
+  # retrieve cookie header
+  _H2="$(_egrep_o 'Cookie: [^;]+' <"$HTTP_HEADER" | _head_n 1)"
+  export _H2
+
+  return 0
+}
+
+_get_root() {
+  domain=$1
+  i=1
+
+  _dns_do_soap getDomainList
+  _all_domains="$(echo "${response}" |
+    tr -d "\n\r\t " |
+    _egrep_o 'domain</key><value[^>]+>[^<]+' |
+    sed -e 's/^domain<\/key><value[^>]*>//g')"
+
+  while true; do
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
+    if [ -z "$h" ]; then
+      return 1
+    fi
+
+    if _contains "${_all_domains}" "^$(_regexcape "$h")\$"; then
+      _domain="$h"
+      return 0
+    fi
+
+    i=$(_math $i + 1)
+  done
+  _debug "$domain not found"
+
+  return 1
+}
+
+_regexcape() {
+  echo "$1" | sed -e 's/\([]\.$*^[]\)/\\\1/g'
+}

dnsapi/dns_doapi.sh

@@ -1,16 +1,14 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_doapi_info='Domain-Offensive do.de
- Official LetsEncrypt API for do.de / Domain-Offensive.
- This API is also available to private customers/individuals.
-Site: do.de
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_doapi
-Options:
- DO_LETOKEN LetsEncrypt Token
-Issues: github.com/acmesh-official/acme.sh/issues/2057
-'
 
-DO_API="https://my.do.de/api/letsencrypt"
+# Official Let's Encrypt API for do.de / Domain-Offensive
+#
+# This is different from the dns_do adapter, because dns_do is only usable for enterprise customers
+# This API is also available to private customers/individuals
+#
+# Provide the required LetsEncrypt token like this:
+# DO_LETOKEN="FmD408PdqT1E269gUK57"
+
+DO_API="https://www.do.de/api/letsencrypt"
 
 ########  Public functions #####################
 

dnsapi/dns_domeneshop.sh

@@ -1,13 +1,4 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_domeneshop_info='DomeneShop.no
-Site: DomeneShop.no
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_domeneshop
-Options:
- DOMENESHOP_Token Token
- DOMENESHOP_Secret Secret
-Issues: github.com/acmesh-official/acme.sh/issues/2457
-'
 
 DOMENESHOP_Api_Endpoint="https://api.domeneshop.no/v0"
 
@@ -93,7 +84,7 @@ _get_domainid() {
   i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug "h" "$h"
     if [ -z "$h" ]; then
       #not valid
@@ -102,7 +93,7 @@ _get_domainid() {
 
     if _contains "$response" "\"$h\"" >/dev/null; then
       # We have found the domain name.
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       _domain=$h
       _domainid=$(printf "%s" "$response" | _egrep_o "[^{]*\"domain\":\"$_domain\"[^}]*" | _egrep_o "\"id\":[0-9]+" | cut -d : -f 2)
       return 0

dnsapi/dns_dp.sh

@@ -1,12 +1,10 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dp_info='DNSPod.cn
-Site: DNSPod.cn
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_dp
-Options:
- DP_Id Id
- DP_Key Key
-'
+
+# Dnspod.cn Domain api
+#
+#DP_Id="1234"
+#
+#DP_Key="sADDsdasdgdsf"
 
 REST_API="https://dnsapi.cn"
 
@@ -91,7 +89,7 @@ add_record() {
 
   _info "Adding record"
 
-  if ! _rest POST "Record.Create" "login_token=$DP_Id,$DP_Key&format=json&lang=en&domain_id=$_domain_id&sub_domain=$_sub_domain&record_type=TXT&value=$txtvalue&record_line=%E9%BB%98%E8%AE%A4"; then
+  if ! _rest POST "Record.Create" "login_token=$DP_Id,$DP_Key&format=json&lang=en&domain_id=$_domain_id&sub_domain=$_sub_domain&record_type=TXT&value=$txtvalue&record_line=默认"; then
     return 1
   fi
 
@@ -109,7 +107,7 @@ _get_root() {
   i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     if [ -z "$h" ]; then
       #not valid
       return 1
@@ -123,7 +121,7 @@ _get_root() {
       _domain_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \")
       _debug _domain_id "$_domain_id"
       if [ "$_domain_id" ]; then
-        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
         _debug _sub_domain "$_sub_domain"
         _domain="$h"
         _debug _domain "$_domain"

dnsapi/dns_dpi.sh

@@ -1,12 +1,10 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dpi_info='DNSPod.com
-Site: DNSPod.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_dpi
-Options:
- DPI_Id Id
- DPI_Key Key
-'
+
+# Dnspod.com Domain api
+#
+#DPI_Id="1234"
+#
+#DPI_Key="sADDsdasdgdsf"
 
 REST_API="https://api.dnspod.com"
 
@@ -55,7 +53,7 @@ dns_dpi_rm() {
     return 1
   fi
 
-  if ! _rest POST "Record.List" "login_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&sub_domain=$_sub_domain"; then
+  if ! _rest POST "Record.List" "user_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&sub_domain=$_sub_domain"; then
     _err "Record.Lis error."
     return 1
   fi
@@ -65,14 +63,14 @@ dns_dpi_rm() {
     return 0
   fi
 
-  record_id=$(echo "$response" | tr "{" "\n" | grep -- "$txtvalue" | grep '^"id"' | cut -d : -f 2 | cut -d '"' -f 2)
+  record_id=$(echo "$response" | _egrep_o '{[^{]*"value":"'"$txtvalue"'"' | cut -d , -f 1 | cut -d : -f 2 | tr -d \")
   _debug record_id "$record_id"
   if [ -z "$record_id" ]; then
     _err "Can not get record id."
     return 1
   fi
 
-  if ! _rest POST "Record.Remove" "login_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&record_id=$record_id"; then
+  if ! _rest POST "Record.Remove" "user_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&record_id=$record_id"; then
     _err "Record.Remove error."
     return 1
   fi
@@ -91,7 +89,7 @@ add_record() {
 
   _info "Adding record"
 
-  if ! _rest POST "Record.Create" "login_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&sub_domain=$_sub_domain&record_type=TXT&value=$txtvalue&record_line=default"; then
+  if ! _rest POST "Record.Create" "user_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&sub_domain=$_sub_domain&record_type=TXT&value=$txtvalue&record_line=default"; then
     return 1
   fi
 
@@ -109,13 +107,13 @@ _get_root() {
   i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     if [ -z "$h" ]; then
       #not valid
       return 1
     fi
 
-    if ! _rest POST "Domain.Info" "login_token=$DPI_Id,$DPI_Key&format=json&domain=$h"; then
+    if ! _rest POST "Domain.Info" "user_token=$DPI_Id,$DPI_Key&format=json&domain=$h"; then
       return 1
     fi
 
@@ -123,7 +121,7 @@ _get_root() {
       _domain_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \")
       _debug _domain_id "$_domain_id"
       if [ "$_domain_id" ]; then
-        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
         _debug _sub_domain "$_sub_domain"
         _domain="$h"
         _debug _domain "$_domain"

dnsapi/dns_dreamhost.sh

@@ -1,14 +1,10 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dreamhost_info='DreamHost.com
-Site: DreamHost.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_dreamhost
-Options:
- DH_API_KEY API Key
-Issues: github.com/RhinoLance/acme.sh
-Author: RhinoLance
-'
 
+#Author: RhinoLance
+#Report Bugs here: https://github.com/RhinoLance/acme.sh
+#
+
+#define the api endpoint
 DH_API_ENDPOINT="https://api.dreamhost.com/"
 querystring=""
 

dnsapi/dns_duckdns.sh

@@ -1,16 +1,18 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_duckdns_info='DuckDNS.org
-Site: www.DuckDNS.org
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_duckdns
-Options:
- DuckDNS_Token API Token
-Author: RaidenII
-'
+
+#Created by RaidenII, to use DuckDNS's API to add/remove text records
+#06/27/2017
+
+# Pass credentials before "acme.sh --issue --dns dns_duckdns ..."
+# --
+# export DuckDNS_Token="aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
+# --
+#
+# Due to the fact that DuckDNS uses StartSSL as cert provider, --insecure may need to be used with acme.sh
 
 DuckDNS_API="https://www.duckdns.org/update"
 
-########  Public functions ######################
+########  Public functions #####################
 
 #Usage: dns_duckdns_add _acme-challenge.domain.duckdns.org "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_duckdns_add() {
@@ -94,7 +96,7 @@ dns_duckdns_rm() {
 _duckdns_get_domain() {
 
   # We'll extract the domain/username from full domain
-  _duckdns_domain="$(printf "%s" "$fulldomain" | _lower_case | _egrep_o '^(_acme-challenge\.)?([a-z0-9-]+\.)+duckdns\.org' | sed -n 's/^\([^.]\{1,\}\.\)*\([a-z0-9-]\{1,\}\)\.duckdns\.org$/\2/p;')"
+  _duckdns_domain="$(printf "%s" "$fulldomain" | _lower_case | _egrep_o '^(_acme-challenge\.)?[a-z0-9-]*\.duckdns\.org' | sed 's/^\(_acme-challenge\.\)\{0,1\}\([a-z0-9-]*\)\.duckdns\.org/\2/')"
 
   if [ -z "$_duckdns_domain" ]; then
     _err "Error extracting the domain."
@@ -110,7 +112,7 @@ _duckdns_rest() {
   param="$2"
   _debug param "$param"
   url="$DuckDNS_API?$param"
-  if [ -n "$DEBUG" ] && [ "$DEBUG" -gt 0 ]; then
+  if [ "$DEBUG" -gt 0 ]; then
     url="$url&verbose=true"
   fi
   _debug url "$url"
@@ -119,7 +121,7 @@ _duckdns_rest() {
   if [ "$method" = "GET" ]; then
     response="$(_get "$url")"
     _debug2 response "$response"
-    if [ -n "$DEBUG" ] && [ "$DEBUG" -gt 0 ] && _contains "$response" "UPDATED" && _contains "$response" "OK"; then
+    if [ "$DEBUG" -gt 0 ] && _contains "$response" "UPDATED" && _contains "$response" "OK"; then
       response="OK"
     fi
   else

dnsapi/dns_durabledns.sh

@@ -1,13 +1,7 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_durabledns_info='DurableDNS.com
-Site: DurableDNS.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_durabledns
-Options:
- DD_API_User API User
- DD_API_Key API Key
-Issues: github.com/acmesh-official/acme.sh/issues/2281
-'
+
+#DD_API_User="xxxxx"
+#DD_API_Key="xxxxxx"
 
 _DD_BASE="https://durabledns.com/services/dns"
 
@@ -110,7 +104,7 @@ _get_root() {
   i=1
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug h "$h"
     if [ -z "$h" ]; then
       #not valid
@@ -118,7 +112,7 @@ _get_root() {
     fi
 
     if _contains "$response" ">$h.</origin>"; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       _domain=$h
       return 0
     fi

dnsapi/dns_dyn.sh

@@ -1,16 +1,10 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dyn_info='Dyn.com
-Domains: dynect.net
-Site: Dyn.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_dyn
-Options:
- DYN_Customer Customer
- DYN_Username API Username
- DYN_Password Secret
-Author: Gerd Naschenweng <https://github.com/magicdude4eva>
-'
-
+#
+# Dyn.com Domain API
+#
+# Author: Gerd Naschenweng
+# https://github.com/magicdude4eva
+#
 # Dyn Managed DNS API
 # https://help.dyn.com/dns-api-knowledge-base/
 #
@@ -26,6 +20,13 @@ Author: Gerd Naschenweng <https://github.com/magicdude4eva>
 # ZoneRemoveNode
 # ZonePublish
 # --
+#
+# Pass credentials before "acme.sh --issue --dns dns_dyn ..."
+# --
+# export DYN_Customer="customer"
+# export DYN_Username="apiuser"
+# export DYN_Password="secret"
+# --
 
 DYN_API="https://api.dynect.net/REST"
 

dnsapi/dns_dynu.sh

@@ -1,21 +1,20 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dynu_info='Dynu.com
-Site: Dynu.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_dynu
-Options:
- Dynu_ClientId Client ID
- Dynu_Secret Secret
-Issues: github.com/shar0119/acme.sh
-Author: Dynu Systems Inc
-'
 
+#Client ID
+#Dynu_ClientId="0b71cae7-a099-4f6b-8ddf-94571cdb760d"
+#
+#Secret
+#Dynu_Secret="aCUEY4BDCV45KI8CSIC3sp2LKQ9"
+#
 #Token
 Dynu_Token=""
 #
 #Endpoint
 Dynu_EndPoint="https://api.dynu.com/v2"
-
+#
+#Author: Dynu Systems, Inc.
+#Report Bugs here: https://github.com/shar0119/acme.sh
+#
 ########  Public functions #####################
 
 #Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
@@ -126,7 +125,7 @@ _get_root() {
   i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug h "$h"
     if [ -z "$h" ]; then
       #not valid
@@ -140,7 +139,7 @@ _get_root() {
     if _contains "$response" "\"domainName\":\"$h\"" >/dev/null; then
       dnsId=$(printf "%s" "$response" | tr -d "{}" | cut -d , -f 2 | cut -d : -f 2)
       _domain_name=$h
-      _node=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _node=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       return 0
     fi
     p=$i

dnsapi/dns_dynv6.sh

@@ -1,79 +1,73 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_dynv6_info='DynV6.com
-Site: DynV6.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_dynv6
-Options:
- DYNV6_TOKEN REST API token. Get from https://DynV6.com/keys
-OptionsAlt:
- KEY Path to SSH private key file. E.g. "/root/.ssh/dynv6"
-Issues: github.com/acmesh-official/acme.sh/issues/2702
-Author: StefanAbl
-'
-
-dynv6_api="https://dynv6.com/api/v2"
+#Author StefanAbl
+#Usage specify a private keyfile to use with dynv6 'export KEY="path/to/keyfile"'
+#if no keyfile is specified, you will be asked if you want to create one in /home/$USER/.ssh/dynv6 and /home/$USER/.ssh/dynv6.pub
 ########  Public functions #####################
 # Please Read this guide first: https://github.com/Neilpang/acme.sh/wiki/DNS-API-Dev-Guide
-#Usage: dns_dynv6_add  _acme-challenge.www.domain.com  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+#Usage: dns_myapi_add  _acme-challenge.www.domain.com  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_dynv6_add() {
-  fulldomain="$(echo "$1" | _lower_case)"
-  txtvalue="$2"
+  fulldomain=$1
+  txtvalue=$2
   _info "Using dynv6 api"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
-  _get_authentication
-  if [ "$dynv6_token" ]; then
-    _dns_dynv6_add_http
-    return $?
-  else
-    _info "using key file $dynv6_keyfile"
-    _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-    if ! _get_domain "$fulldomain" "$_your_hosts"; then
-      _err "Host not found on your account"
-      return 1
-    fi
-    _debug "found host on your account"
-    returnval="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts \""$_host"\" records set \""$_record"\" txt data \""$txtvalue"\")"
-    _debug "Dynv6 returned this after record was added: $returnval"
-    if _contains "$returnval" "created"; then
-      return 0
-    elif _contains "$returnval" "updated"; then
-      return 0
-    else
-      _err "Something went wrong! it does not seem like the record was added successfully"
-      return 1
-    fi
-  fi
+  _get_keyfile
+  _info "using keyfile $dynv6_keyfile"
+  _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
 
+  if ! _get_domain "$fulldomain" "$_your_hosts"; then
+  	_err "Host not found on your account"
+  	return 1
+  fi
+#  if ! _contains "$_your_hosts" "$_host"; then
+#    _debug "The host is $_host and the record $_record"
+#    _debug "Dynv6 returned $_your_hosts"
+#    _err "The host $_host does not exists on your dynv6 account"
+#    return 1
+#  fi
+  _debug "found host on your account"
+  returnval="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts \""$_host"\" records set \""$_record"\" txt data \""$txtvalue"\")"
+  _debug "Dynv6 returend this after record was added: $returnval"
+  if _contains "$returnval" "created"; then
+    return 0
+  elif _contains "$returnval" "updated"; then
+    return 0
+  else
+    _err "Something went wrong! it does not seem like the record was added succesfully"
+    return 1
+  fi
+  return 1
 }
 #Usage: fulldomain txtvalue
 #Remove the txt record after validation.
 dns_dynv6_rm() {
-  fulldomain="$(echo "$1" | _lower_case)"
-  txtvalue="$2"
-  _info "Using dynv6 API"
+  fulldomain=$1
+  txtvalue=$2
+  _info "Using dynv6 api"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
-  _get_authentication
-  if [ "$dynv6_token" ]; then
-    _dns_dynv6_rm_http
-    return $?
-  else
-    _info "using key file $dynv6_keyfile"
-    _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-    if ! _get_domain "$fulldomain" "$_your_hosts"; then
-      _err "Host not found on your account"
-      return 1
-    fi
-    _debug "found host on your account"
-    _info "$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts "\"$_host\"" records del "\"$_record\"" txt)"
-    return 0
+  _get_keyfile
+  _info "using keyfile $dynv6_keyfile"
+  _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
+  if ! _get_domain "$fulldomain" "$_your_hosts"; then
+  	_err "Host not found on your account"
+  	return 1
   fi
+#  if ! _contains "$_your_hosts" "$_host"; then
+#    _debug "The host is $_host and the record $_record"
+#   _debug "Dynv6 returned $_your_hosts"
+#    _err "The host $_host does not exists on your dynv6 account"
+#    return 1
+#  fi
+  _debug "found host on your account"
+  _info "$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts "\"$_host\"" records del "\"$_record\"" txt)"
+  return 0
+
 }
 #################### Private functions below ##################################
 #Usage: No Input required
 #returns
-#dynv6_keyfile the path to the new key file that has been generated
+#dynv6_keyfile the path to the new keyfile that has been generated
 _generate_new_key() {
   dynv6_keyfile="$(eval echo ~"$USER")/.ssh/dynv6"
   _info "Path to key file used: $dynv6_keyfile"
@@ -99,13 +93,13 @@ _get_domain() {
 
   _your_hosts="$(echo "$_your_hosts" | awk '/\./ {print $1}')"
   for l in $_your_hosts; do
-    #echo "host: $l"
-    if test "${_full_domain#*"$l"}" != "$_full_domain"; then
-      _record=${_full_domain%."$l"}
-      _host=$l
-      _debug "The host is $_host and the record $_record"
-      return 0
-    fi
+  	#echo "host: $l"
+  	if test "${_full_domain#*$l}" != "$_full_domain"; then
+  	  _record="${_full_domain%.$l}"
+  	  _host=$l
+  	  _debug "The host is $_host and the record $_record"
+  	  return 0
+  	fi
   done
   _err "Either their is no such host on your dnyv6 account or it cannot be accessed with this key"
   return 1
@@ -114,178 +108,22 @@ _get_domain() {
 # Usage: No input required
 #returns
 #dynv6_keyfile path to the key that will be used
-_get_authentication() {
-  dynv6_token="${DYNV6_TOKEN:-$(_readaccountconf_mutable dynv6_token)}"
-  if [ "$dynv6_token" ]; then
-    _debug "Found HTTP Token. Going to use the HTTP API and not the SSH API"
-    if [ "$DYNV6_TOKEN" ]; then
-      _saveaccountconf_mutable dynv6_token "$dynv6_token"
-    fi
-  else
-    _debug "no HTTP token found. Looking for an SSH key"
-    dynv6_keyfile="${dynv6_keyfile:-$(_readaccountconf_mutable dynv6_keyfile)}"
-    _debug "Your key is $dynv6_keyfile"
-    if [ -z "$dynv6_keyfile" ]; then
-      if [ -z "$KEY" ]; then
-        _err "You did not specify a key to use with dynv6"
-        _info "Creating new dynv6 API key to add to dynv6.com"
-        _generate_new_key
-        _info "Please add this key to dynv6.com $(cat "$dynv6_keyfile.pub")"
-        _info "Hit Enter to continue"
-        read -r _
-        #save the credentials to the account conf file.
-      else
-        dynv6_keyfile="$KEY"
-      fi
-      _saveaccountconf_mutable dynv6_keyfile "$dynv6_keyfile"
+_get_keyfile() {
+  _debug "get keyfile method called"
+  dynv6_keyfile="${dynv6_keyfile:-$(_readaccountconf_mutable dynv6_keyfile)}"
+  _debug "Your key is $dynv6_keyfile"
+  if [ -z "$dynv6_keyfile" ]; then
+    if [ -z "$KEY" ]; then
+      _err "You did not specify a key to use with dynv6"
+      _info "Creating new dynv6 api key to add to dynv6.com"
+      _generate_new_key
+      _info "Please add this key to dynv6.com $(cat "$dynv6_keyfile.pub")"
+      _info "Hit Enter to contiue"
+      read -r _
+      #save the credentials to the account conf file.
+    else
+      dynv6_keyfile="$KEY"
     fi
+    _saveaccountconf_mutable dynv6_keyfile "$dynv6_keyfile"
   fi
 }
-
-_dns_dynv6_add_http() {
-  _debug "Got HTTP token form _get_authentication method. Going to use the HTTP API"
-  if ! _get_zone_id "$fulldomain"; then
-    _err "Could not find a matching zone for $fulldomain. Maybe your HTTP Token is not authorized to access the zone"
-    return 1
-  fi
-  _get_zone_name "$_zone_id"
-  record=${fulldomain%%."$_zone_name"}
-  _set_record TXT "$record" "$txtvalue"
-  if _contains "$response" "$txtvalue"; then
-    _info "Successfully added record"
-    return 0
-  else
-    _err "Something went wrong while adding the record"
-    return 1
-  fi
-}
-
-_dns_dynv6_rm_http() {
-  _debug "Got HTTP token form _get_authentication method. Going to use the HTTP API"
-  if ! _get_zone_id "$fulldomain"; then
-    _err "Could not find a matching zone for $fulldomain. Maybe your HTTP Token is not authorized to access the zone"
-    return 1
-  fi
-  _get_zone_name "$_zone_id"
-  record=${fulldomain%%."$_zone_name"}
-  _get_record_id "$_zone_id" "$record" "$txtvalue"
-  _del_record "$_zone_id" "$_record_id"
-  if [ -z "$response" ]; then
-    _info "Successfully deleted record"
-    return 0
-  else
-    _err "Something went wrong while deleting the record"
-    return 1
-  fi
-}
-
-#get the zoneid for a specifc record or zone
-#usage: _get_zone_id §record
-#where $record is the record to get the id for
-#returns _zone_id the id of the zone
-_get_zone_id() {
-  record="$1"
-  _debug "getting zone id for $record"
-  _dynv6_rest GET zones
-
-  zones="$(echo "$response" | tr '}' '\n' | tr ',' '\n' | grep name | sed 's/\[//g' | tr -d '{' | tr -d '"')"
-  #echo $zones
-
-  selected=""
-  for z in $zones; do
-    z="${z#name:}"
-    _debug zone: "$z"
-    if _contains "$record" "$z"; then
-      _debug "$z found in $record"
-      selected="$z"
-    fi
-  done
-  if [ -z "$selected" ]; then
-    _err "no zone found"
-    return 1
-  fi
-
-  zone_id="$(echo "$response" | tr '}' '\n' | grep "$selected" | tr ',' '\n' | grep '"id":' | tr -d '"')"
-  _zone_id="${zone_id#id:}"
-  _debug "zone id: $_zone_id"
-}
-
-_get_zone_name() {
-  _zone_id="$1"
-  _dynv6_rest GET zones/"$_zone_id"
-  _zone_name="$(echo "$response" | tr ',' '\n' | tr -d '{' | grep name | tr -d '"')"
-  _zone_name="${_zone_name#name:}"
-}
-
-#usaage _get_record_id $zone_id $record
-# where zone_id is thevalue returned by _get_zone_id
-# and record ist in the form _acme.www for an fqdn of _acme.www.example.com
-# returns _record_id
-_get_record_id() {
-  _zone_id="$1"
-  record="$2"
-  value="$3"
-  _dynv6_rest GET "zones/$_zone_id/records"
-  if ! _get_record_id_from_response "$response"; then
-    _err "no such record $record found in zone $_zone_id"
-    return 1
-  fi
-}
-
-_get_record_id_from_response() {
-  response="$1"
-  _record_id="$(echo "$response" | tr '}' '\n' | grep "\"name\":\"$record\"" | grep "\"data\":\"$value\"" | tr ',' '\n' | grep id | tr -d '"' | tr -d 'id:')"
-  #_record_id="${_record_id#id:}"
-  if [ -z "$_record_id" ]; then
-    _err "no such record: $record found in zone $_zone_id"
-    return 1
-  fi
-  _debug "record id: $_record_id"
-  return 0
-}
-#usage: _set_record TXT _acme_challenge.www longvalue 12345678
-#zone id is optional can also be set as vairable bevor calling this method
-_set_record() {
-  type="$1"
-  record="$2"
-  value="$3"
-  if [ "$4" ]; then
-    _zone_id="$4"
-  fi
-  data="{\"name\": \"$record\", \"data\": \"$value\", \"type\": \"$type\"}"
-  #data='{ "name": "acme.test.thorn.dynv6.net", "type": "A", "data": "192.168.0.1"}'
-  echo "$data"
-  #"{\"type\":\"TXT\",\"name\":\"$fulldomain\",\"content\":\"$txtvalue\",\"ttl\":120}"
-  _dynv6_rest POST "zones/$_zone_id/records" "$data"
-}
-_del_record() {
-  _zone_id=$1
-  _record_id=$2
-  _dynv6_rest DELETE zones/"$_zone_id"/records/"$_record_id"
-}
-
-_dynv6_rest() {
-  m=$1    #method GET,POST,DELETE or PUT
-  ep="$2" #the endpoint
-  data="$3"
-  _debug "$ep"
-
-  token_trimmed=$(echo "$dynv6_token" | tr -d '"')
-
-  export _H1="Authorization: Bearer $token_trimmed"
-  export _H2="Content-Type: application/json"
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$dynv6_api/$ep" "" "$m")"
-  else
-    response="$(_get "$dynv6_api/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}

dnsapi/dns_easydns.sh

@@ -1,17 +1,14 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_easydns_info='easyDNS.net
-Site: easyDNS.net
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_easydns
-Options:
- EASYDNS_Token API Token
- EASYDNS_Key API Key
-Issues: github.com/acmesh-official/acme.sh/issues/2647
-Author: Neilpang, wurzelpanzer <wurzelpanzer@maximolider.net>
-'
 
+#######################################################
+#
+# easyDNS REST API for acme.sh by Neilpang based on dns_cf.sh
+#
 # API Documentation: https://sandbox.rest.easydns.net:3001/
-
+#
+# Author: wurzelpanzer [wurzelpanzer@maximolider.net]
+# Report Bugs here: https://github.com/acmesh-official/acme.sh/issues/2647
+#
 ####################  Public functions #################
 
 #EASYDNS_Key="xxxxxxxxxxxxxxxxxxxxxxxx"
@@ -121,7 +118,7 @@ _get_root() {
   i=1
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
     _debug h "$h"
     if [ -z "$h" ]; then
       #not valid
@@ -133,7 +130,7 @@ _get_root() {
     fi
 
     if _contains "$response" "\"status\":200"; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
       _domain=$h
       return 0
     fi

dnsapi/dns_edgedns.sh

@@ -1,15 +1,4 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_edgedns_info='Akamai.com Edge DNS
-Site: techdocs.Akamai.com/edge-dns/reference/edge-dns-api
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_edgedns
-Options: Specify individual credentials
- AKAMAI_HOST Host
- AKAMAI_ACCESS_TOKEN Access token
- AKAMAI_CLIENT_TOKEN Client token
- AKAMAI_CLIENT_SECRET Client secret
-Issues: github.com/acmesh-official/acme.sh/issues/3157
-'
 
 # Akamai Edge DNS v2  API
 # User must provide Open Edgegrid API credentials to the EdgeDNS installation. The remote user in EdgeDNS must have CRUD access to
@@ -17,10 +6,18 @@ Issues: github.com/acmesh-official/acme.sh/issues/3157
 
 # Report bugs to https://control.akamai.com/apps/support-ui/#/contact-support
 
+# Values to export:
+# --EITHER--
 # *** TBD. NOT IMPLEMENTED YET ***
-# Specify Edgegrid credentials file and section.
-# AKAMAI_EDGERC Edge RC. Full file path
-# AKAMAI_EDGERC_SECTION Edge RC Section. E.g. "default"
+# specify Edgegrid credentials file and section
+# AKAMAI_EDGERC=<full file path>
+# AKAMAI_EDGERC_SECTION="default"
+## --OR--
+# specify indiviual credentials
+# export AKAMAI_HOST = <host>
+# export AKAMAI_ACCESS_TOKEN = <access token>
+# export AKAMAI_CLIENT_TOKEN = <client token>
+# export AKAMAI_CLIENT_SECRET = <client secret>
 
 ACME_EDGEDNS_VERSION="0.1.0"
 
@@ -179,7 +176,6 @@ _EDGEDNS_credentials() {
   _debug "GettingEdge DNS credentials"
   _log "$(printf "ACME DNSAPI Edge DNS version %s" ${ACME_EDGEDNS_VERSION})"
   args_missing=0
-  AKAMAI_ACCESS_TOKEN="${AKAMAI_ACCESS_TOKEN:-$(_readaccountconf_mutable AKAMAI_ACCESS_TOKEN)}"
   if [ -z "$AKAMAI_ACCESS_TOKEN" ]; then
     AKAMAI_ACCESS_TOKEN=""
     AKAMAI_CLIENT_TOKEN=""
@@ -188,7 +184,6 @@ _EDGEDNS_credentials() {
     _err "AKAMAI_ACCESS_TOKEN is missing"
     args_missing=1
   fi
-  AKAMAI_CLIENT_TOKEN="${AKAMAI_CLIENT_TOKEN:-$(_readaccountconf_mutable AKAMAI_CLIENT_TOKEN)}"
   if [ -z "$AKAMAI_CLIENT_TOKEN" ]; then
     AKAMAI_ACCESS_TOKEN=""
     AKAMAI_CLIENT_TOKEN=""
@@ -197,7 +192,6 @@ _EDGEDNS_credentials() {
     _err "AKAMAI_CLIENT_TOKEN is missing"
     args_missing=1
   fi
-  AKAMAI_HOST="${AKAMAI_HOST:-$(_readaccountconf_mutable AKAMAI_HOST)}"
   if [ -z "$AKAMAI_HOST" ]; then
     AKAMAI_ACCESS_TOKEN=""
     AKAMAI_CLIENT_TOKEN=""
@@ -206,7 +200,6 @@ _EDGEDNS_credentials() {
     _err "AKAMAI_HOST is missing"
     args_missing=1
   fi
-  AKAMAI_CLIENT_SECRET="${AKAMAI_CLIENT_SECRET:-$(_readaccountconf_mutable AKAMAI_CLIENT_SECRET)}"
   if [ -z "$AKAMAI_CLIENT_SECRET" ]; then
     AKAMAI_ACCESS_TOKEN=""
     AKAMAI_CLIENT_TOKEN=""
@@ -421,7 +414,7 @@ _edgedns_make_data_to_sign() {
   _secure_debug2 "hdr" "$hdr"
   _edgedns_make_content_hash
   path="$(echo "$_request_url_path" | tr -d "\n\r" | sed 's/https\?:\/\///')"
-  path=${path#*"$AKAMAI_HOST"}
+  path="${path#*$AKAMAI_HOST}"
   _debug "hier path" "$path"
   # dont expose headers to sign so use MT string
   _mdata="$(printf "%s\thttps\t%s\t%s\t%s\t%s\t%s" "$_request_method" "$AKAMAI_HOST" "$path" "" "$_hash" "$hdr")"

dnsapi/dns_euserv.sh

@@ -1,14 +1,18 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_euserv_info='EUserv.com
-Domains: EUserv.eu
-Site: EUserv.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_euserv
-Options:
- EUSERV_Username Username
- EUSERV_Password Password
-Author: Michael Brueckner
-'
+
+#This is the euserv.eu api wrapper for acme.sh
+#
+#Author: Michael Brueckner
+#Report Bugs: https://www.github.com/initit/acme.sh  or  mbr@initit.de
+
+#
+#EUSERV_Username="username"
+#
+#EUSERV_Password="password"
+#
+# Dependencies:
+# -------------
+# - none -
 
 EUSERV_Api="https://api.euserv.net"
 
@@ -151,7 +155,7 @@ _get_root() {
   response="$_euserv_domain_orders"
 
   while true; do
-    h=$(echo "$domain" | cut -d . -f "$i"-100)
+    h=$(echo "$domain" | cut -d . -f $i-100)
     _debug h "$h"
     if [ -z "$h" ]; then
       #not valid
@@ -159,7 +163,7 @@ _get_root() {
     fi
 
     if _contains "$response" "$h"; then
-      _sub_domain=$(echo "$domain" | cut -d . -f 1-"$p")
+      _sub_domain=$(echo "$domain" | cut -d . -f 1-$p)
       _domain="$h"
       if ! _euserv_get_domain_id "$_domain"; then
         _err "invalid domain"