diff --git a/salt/bugs/init.sls b/salt/bugs/init.sls index 661b7e3d..8fe4b9e9 100644 --- a/salt/bugs/init.sls +++ b/salt/bugs/init.sls @@ -8,6 +8,8 @@ lego_bootstrap: cmd.run: - name: /usr/local/bin/lego -a --email="infrastructure-staff@python.org" {% if pillar["dc"] == "vagrant" %}--server=https://salt-master.vagrant.psf.io:14000/dir{% endif %} --domains="{{ grains['fqdn'] }}" {%- for domain in pillar['bugs']['subject_alternative_names'] %} --domains {{ domain }}{%- endfor %} --http --path /etc/lego --key-type ec256 run - creates: /etc/lego/certificates/{{ grains['fqdn'] }}.json + - require: + - archive: lego_extract lego_renew: cron.present: diff --git a/salt/tls/pebble.sls b/salt/tls/pebble.sls index 1f0cc52b..ec6e991a 100644 --- a/salt/tls/pebble.sls +++ b/salt/tls/pebble.sls @@ -1,4 +1,4 @@ -{% if pillar.get('pebble', default={'enabled': False}).enabled %} +{% if pillar.get('pebble', {'enabled': False}).enabled %} pebble-build-deps: pkg.installed: - pkgs: