feat(map): add FreeBSD support for certbot

saltstack-formulas · Jul 29, 2020 · 911a443 · 911a443
1 parent c40262b
commit 911a443
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/letsencrypt/defaults.yaml b/letsencrypt/defaults.yaml
@@ -6,6 +6,8 @@ letsencrypt:
   pkgs:
     - python3-certbot-apache
   service: certbot.timer
+  # Only used for the pkg install method (use_package: true), internal var
+  _cli_path: /usr/bin/certbot
   # Only used for the git install method (use_package: false)
   cli_install_dir: /opt/letsencrypt
   # Only used for the git install method (use_package: false). If you want to

diff --git a/letsencrypt/domains.sls b/letsencrypt/domains.sls
@@ -5,12 +5,12 @@
 
 {% if letsencrypt.use_package %}
   # Renew checks if the cert exists and needs to be renewed
-  {% set check_cert_cmd = '/usr/bin/certbot renew --dry-run --no-random-sleep-on-renew --cert-name' %}
-  {% set renew_cert_cmd = '/usr/bin/certbot renew' %}
+  {% set check_cert_cmd = letsencrypt._cli_path ~ ' renew --dry-run --no-random-sleep-on-renew --cert-name' %}
+  {% set renew_cert_cmd = letsencrypt._cli_path ~ ' renew' %}
   {% set old_check_cert_cmd_state = 'absent' %}
   {% set old_renew_cert_cmd_state = 'absent' %}
   {% set old_cron_state = 'absent' %}
-  {% set create_cert_cmd = '/usr/bin/certbot' %}
+  {% set create_cert_cmd = letsencrypt._cli_path %}
 
 {% else %}
   {% set check_cert_cmd = '/usr/local/bin/check_letsencrypt_cert.sh' %}

diff --git a/letsencrypt/osfamilymap.yaml b/letsencrypt/osfamilymap.yaml
@@ -3,3 +3,6 @@
 ---
 RedHat:
   service: certbot-renew.timer
+FreeBSD:
+  # Only used for the pkg install method (use_package: true), internal var
+  _cli_path: /usr/local/bin/certbot