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/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -16,7 +16,7 @@ postgres:
    command: initdb --pgdata=/var/lib/pgsql/data
    test: test -f /var/lib/pgsql/data/PG_VERSION
    user: postgres
-    env: {}
+    env: []

  conf_dir: /var/lib/pgsql/data
  postgresconf: ""