saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid crash if private_key is not shipped in pillar

Browse Source
This commit is contained in:
Arthur Lutz 2016-10-12 10:52:17 +02:00 committed by GitHub
parent ef8fb87105
commit 727826d272
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nginx/ng/certificates.sls
View File

@ -11,6 +11,7 @@ nginx_{{ domain }}_ssl_certificate:
- watch_in: - watch_in:
- service: nginx_service - service: nginx_service
{% if salt['pillar.get']("nginx:ng:certificates:{}:private_key".format(domain)) %}
nginx_{{ domain }}_ssl_key: nginx_{{ domain }}_ssl_key:
file.managed: file.managed:
- name: /etc/nginx/ssl/{{ domain }}.key - name: /etc/nginx/ssl/{{ domain }}.key
@ -19,5 +20,5 @@ nginx_{{ domain }}_ssl_key:
- contents_pillar: nginx:ng:certificates:{{ domain }}:private_key - contents_pillar: nginx:ng:certificates:{{ domain }}:private_key
- watch_in: - watch_in:
- service: nginx_service - service: nginx_service
{% endif %}
{%- endfor %} {%- endfor %}