commit 55e76471a973448b20982e81486636106b3811ce
author Ales Komarek <ales.komarek@tcpcloud.eu> Tue Sep 06 19:06:27 2016 +0200
committer Ales Komarek <ales.komarek@tcpcloud.eu> Tue Sep 06 19:06:27 2016 +0200
tree 9ea8da63de6b5b76f24f8973084082d6b4eb5113
parent f15f45d5f648a3b628acc25e9dfa106f82aea55e

SSL fix

nginx/server/sites.sls

diff --git a/nginx/server/sites.sls b/nginx/server/sites.sls
index 7aa7add..78b806f 100644
--- a/nginx/server/sites.sls
+++ b/nginx/server/sites.sls
@@ -62,9 +62,9 @@
 {%- elif site.ssl.engine == 'salt' %}
 
 nginx_init_{{ site.host.name }}_tls:
-  cmd.wait:
+  cmd.run:
   - name: "cat /etc/ssl/certs/{{ site.host.name }}.crt /etc/ssl/certs/ca-{{ site.ssl.authority }}.crt > /etc/ssl/certs/{{ site.host.name }}-with-chain.crt"
-  - watch:
+  - require:
     - x509: /etc/ssl/certs/{{ site.host.name }}.crt
     - x509: /etc/ssl/certs/ca-{{ site.ssl.authority }}.crt
   - watch_in: