Explorar el Código

Merge pull request #131 from arthurlogilab/patch-1

avoid crash if private_key is not shipped in pillar
susefix
Forrest hace 8 años
padre
commit
9e47729230
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. +2
    -1
      nginx/ng/certificates.sls

+ 2
- 1
nginx/ng/certificates.sls Ver fichero

@@ -11,6 +11,7 @@ nginx_{{ domain }}_ssl_certificate:
- watch_in:
- service: nginx_service

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

Cargando…
Cancelar
Guardar