D3906.id10120.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3906.id10120.diff
View Options

	diff --git a/pillar/core/certificates/hervil.sls b/pillar/core/certificates/hervil.sls
	--- a/pillar/core/certificates/hervil.sls
	+++ b/pillar/core/certificates/hervil.sls
	@@ -11,5 +11,9 @@
	- admin.mail.nasqueron.org

	certificates_options:
	+ admin.mail.nasqueron.org:
	+ reload: sudo acmesh-nginxCheck
	+ hervil.nasqueron.org:
	+ reload: sudo acmesh-nginxCheck
	mail.nasqueron.org:
	shared_group: mail
	diff --git a/roles/core/certificates/acmesh.sls b/roles/core/certificates/acmesh.sls
	--- a/roles/core/certificates/acmesh.sls
	+++ b/roles/core/certificates/acmesh.sls
	@@ -34,6 +34,18 @@
	{% for domain in certificates %}
	{% set options = certificates_options.get(domain, {}) %}

	+deploy_certificate_for_domain_{{ domain }}:
	+ cmd.run:
	+ - name: \|
	+ acme.sh --install-cert -d {{ domain }} \
	+ {% if "reload" in options %}
	+ --reload "{{ options["reload"] }}" \
	+ {% endif %}
	+ --cert-file /var/certificates/{{ domain }}/cert.pem \
	+ --key-file /var/certificates/{{ domain }}/key.pem \
	+ --fullchain-file /var/certificates/{{ domain }}/fullchain.pem \
	+ --ca-file /var/certificates/{{ domain }}/chain.pem
	+
	/var/certificates/{{ domain }}:
	file.directory:
	- user: acme