Skip to content

Commit 8d33d6c

Browse files
committed
fix: make acme_certs different from acme_certs πŸ˜΅β€πŸ’«
1 parent b740196 commit 8d33d6c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

β€Žpillar/base/tls.slsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ tls:
6262
roles:
6363
- hg
6464

65-
acme_certs:
65+
acme_cert_configs:
6666
pycon.org:
6767
validation: http
6868
roles:

β€Žsalt/_extensions/pillar/ca.pyβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,8 @@ def ext_pillar(minion_id, pillar, base="/etc/ssl", name="PSFCA", cert_opts=None)
349349
data["tls"]["certs"][certificate] = cert_data
350350

351351
# Collect ACME certs (acme.cert) for this minion based on its roles
352-
acme_certs = pillar.get("tls", {}).get("acme_certs", {})
353-
for domain, domain_config in acme_certs.items():
352+
acme_cert_configs = pillar.get("tls", {}).get("acme_cert_configs", {})
353+
for domain, domain_config in acme_cert_configs.items():
354354
cert_roles = domain_config.get("roles", [])
355355
if any(role in minion_roles for role in cert_roles):
356356
cert_name = domain_config.get('name', domain)

β€Žsalt/tls/init.slsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ certbot:
6060

6161
{% if salt["match.compound"](pillar["roles"]["salt-master"]["pattern"]) %}
6262
# Process ACME certificates
63-
{% for domain, domain_config in salt["pillar.get"]("tls:acme_certs", {}).items() %}
63+
{% for domain, domain_config in salt["pillar.get"]("tls:acme_cert_configs", {}).items() %}
6464
{{ domain }}:
6565
acme.cert:
6666

0 commit comments

Comments
Β (0)