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

Fixing merge conflict.

Browse Source
This commit is contained in:
Berry Langerak
2014-10-06 11:43:45 +02:00
parent c9aeea4c66 8bdfb89b38
commit cfbc2910ed
2 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
postgres/map.jinja
View File

@@ -1,27 +1,42 @@
{% set postgres = salt['grains.filter_by']({
'Debian': {
'pkg': 'postgresql-9.1',
'pkg_dev': 'postgresql-server-dev-9.1',
'pkg_libpq_dev': 'libpq-dev',
'python': 'python-pygresql',
'service': 'postgresql',
'pg_hba': '/etc/postgresql/9.1/main/pg_hba.conf',
'conf_dir': '/etc/postgresql/9.1/main',
'create_cluster': False,
'init_db': False,
'version': '9.1',
},
'RedHat': {
'pkg': 'postgresql',
'python': 'postgresql-python',
'pkg': 'postgresql-server',
'pkg_dev': 'postgresql-devel',
'pkg_libpq_dev': 'postgresql-libs',
'python': 'python-psycopg2',
'service': 'postgresql',
'conf_dir': '/var/lib/pgsql/data',
'create_cluster': False,
'init_db': True,
'version': '9.1',
},
'Arch': {
'pkg': 'postgresql',
'pkg_dev': 'postgresql-devel',
'pkg_libpq_dev': 'postgresql-libs',
'python': 'python-psycopg2',
'service': 'postgresql',
'conf_dir': '/var/lib/pgsql/data',
},
}, merge=salt['grains.filter_by']({
'14.04': {
'pkg': 'postgresql',
'pkg_dev': 'postgresql-server-dev-9.3',
'conf_dir': '/etc/postgresql/9.3/main',
},
'14.04': {
'pkg': 'postgresql',
'pkg_dev': 'postgresql-server-dev-9.3',
'conf_dir': '/etc/postgresql/9.3/main',
'service': 'postgresql',
'create_cluster': True,
'version': '9.3',
},
}, grain='lsb_distrib_release', merge=salt['pillar.get']('postgres:lookup'))) %}