karel/postgres-formula
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing the static 9.3 from init.sls, moving it to a variable.

Browse Source
This commit is contained in:
Berry Langerak
2014-10-06 10:38:12 +02:00
parent aef555ad80
commit 59e6f3e1fd
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postgres/init.sls
View File

@@ -10,7 +10,7 @@ create-postgresql-cluster:
cmd.run: cmd.run:
- cwd: / - cwd: /
- user: root - user: root
- name: pg_createcluster 9.3 main --start - name: pg_createcluster {{ postgres.version }} main --start
- unless: test -f {{ postgres.conf_dir }}/postgresql.conf - unless: test -f {{ postgres.conf_dir }}/postgresql.conf
- env: - env:
LC_ALL: C.UTF-8 LC_ALL: C.UTF-8

4
postgres/map.jinja
View File

@@ -8,6 +8,7 @@
'conf_dir': '/etc/postgresql/9.1/main', 'conf_dir': '/etc/postgresql/9.1/main',
'create_cluster': False, 'create_cluster': False,
'init_db': False, 'init_db': False,
'version': '9.1',
}, },
'RedHat': { 'RedHat': {
'pkg': 'postgresql-server', 'pkg': 'postgresql-server',
@@ -18,6 +19,7 @@
'conf_dir': '/var/lib/pgsql/data', 'conf_dir': '/var/lib/pgsql/data',
'create_cluster': False, 'create_cluster': False,
'init_db': True, 'init_db': True,
'version': '9.1',
}, },
'Arch': { 'Arch': {
'pkg': 'postgresql', 'pkg': 'postgresql',
@@ -28,6 +30,7 @@
'conf_dir': '/var/lib/pgsql/data/', 'conf_dir': '/var/lib/pgsql/data/',
'create_cluster': False, 'create_cluster': False,
'init_db': False, 'init_db': False,
'version': '9.1',
}, },
}, merge=salt['grains.filter_by']({ }, merge=salt['grains.filter_by']({
'14.04': { '14.04': {
@@ -36,5 +39,6 @@
'conf_dir': '/etc/postgresql/9.3/main', 'conf_dir': '/etc/postgresql/9.3/main',
'service': 'postgresql', 'service': 'postgresql',
'create_cluster': True, 'create_cluster': True,
'version': '9.3',
}, },
}, grain='lsb_distrib_release', merge=salt['pillar.get']('postgres:lookup'))) %} }, grain='lsb_distrib_release', merge=salt['pillar.get']('postgres:lookup'))) %}