Merge branch 'master' into alternatives

2018-03-06 16:26:08 +00:00
parent db90890184 c727fa5ea1
commit 9e6adde7b5
6 changed files with 57 additions and 25 deletions
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -48,7 +48,7 @@ postgresql-cluster-prepared:
    - name: {{ postgres.prepare_cluster.command }}
    - cwd: /
    - runas: {{ postgres.prepare_cluster.user }}
-    - env: {{ postgres.prepare_cluster.env|default({}) }}
+    - env: {{ postgres.prepare_cluster.env }}
    - unless:
      - {{ postgres.prepare_cluster.test }}
    - require: