fix(domains): update git check cert script

saltstack-formulas · Jun 13, 2021 · 2cbb50c · 2cbb50c
1 parent a11fa8b
commit 2cbb50c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/letsencrypt/domains.sls b/letsencrypt/domains.sls
@@ -53,12 +53,16 @@ create-initial-cert-{{ setname }}-{{ domainlist | join('+') }}:
     - cwd: {{ letsencrypt.cli_install_dir }}
       {% endif %}
     - unless:
+      {% if letsencrypt.use_package %}
       - fun: cmd.run
         python_shell: true
         cmd: |
           {{ check_cert_cmd }} {{ setname }} \
             -d {{ domainlist|join(' -d ') }} | \
             /bin/grep -q "Certificate Name: {{ setname }}"
+      {% else %}
+      - {{ check_cert_cmd }} {{ setname }} {{ domainlist | join(' ') }}
+      {% endif %}
     - require:
       {% if letsencrypt.use_package %}
       - pkg: letsencrypt-client

diff --git a/letsencrypt/files/check_letsencrypt_cert.sh.jinja b/letsencrypt/files/check_letsencrypt_cert.sh.jinja
@@ -1,13 +1,13 @@
 #!/bin/bash
 {% from "letsencrypt/map.jinja" import letsencrypt with context %}
 
-FIRST_CERT=$1
-
+CERT_NAME=$1
+shift
 for DOMAIN in "$@"
 do
-    openssl x509 -in {{ letsencrypt.config_dir.path }}/live/$FIRST_CERT/cert.pem -noout -text | grep DNS:${DOMAIN} > /dev/null || exit 1
+    openssl x509 -in {{ letsencrypt.config_dir.path }}/live/$CERT_NAME/cert.pem -noout -text | grep DNS:${DOMAIN} > /dev/null || exit 1
 done
-CERT=$(date -d "$(openssl x509 -in {{ letsencrypt.config_dir.path }}/live/$FIRST_CERT/cert.pem -enddate -noout | cut -d'=' -f2)" "+%s")
+CERT=$(date -d "$(openssl x509 -in {{ letsencrypt.config_dir.path }}/live/$CERT_NAME/cert.pem -enddate -noout | cut -d'=' -f2)" "+%s")
 CURRENT=$(date "+%s")
 REMAINING=$((($CERT - $CURRENT) / 60 / 60 / 24))
 [ "$REMAINING" -gt "30" ] || exit 1