PoC ready
diff --git a/postgresql/map.jinja b/postgresql/map.jinja
index 530c465..5e6d99c 100644
--- a/postgresql/map.jinja
+++ b/postgresql/map.jinja
@@ -17,7 +17,7 @@
'version': version,
'init_command': 'service postgresql-9.3 initdb',
'dir': {
- 'config': '/var/lib/pgsql/data'
+ 'config': '/var/lib/pgsql/9.3/data'
},
'gis': False,
},
diff --git a/postgresql/server.sls b/postgresql/server.sls
index b0beed9..11b29be 100644
--- a/postgresql/server.sls
+++ b/postgresql/server.sls
@@ -18,8 +18,6 @@
- file: {{ server.dir.config }}/pg_hba.conf
- file: {{ server.dir.config }}/postgresql.conf
-{%- endif %}
-
{{ server.dir.config }}/pg_hba.conf:
file.managed:
- source: salt://postgresql/files/pg_hba.conf
@@ -38,6 +36,8 @@
postgresql_version: {{ server.version }}
- mode: 600
+{%- endif %}
+
/root/.pgpass:
file.managed:
- source: salt://postgresql/files/pgpass
@@ -46,6 +46,8 @@
- group: root
- mode: 600
+{%- if grains.os_family == "Debian" %}
+
postgresql_service:
service.running:
- name: {{ server.service }}
@@ -70,8 +72,6 @@
- require:
- pkg: postgresql_packages
-{%- if grains.os_family == "Debian" %}
-
{%- for database_name, database in server.get('database', {}).iteritems() %}
{%- for user in database.users %}