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

Merge pull request #27 from saxonww/master

Browse Source 
Remove duplication in map.jinja
This commit is contained in:
Forrest
2014-12-31 15:39:18 -08:00
parent 6173593c35 a58f153fb1
commit ff0742dd44
1 changed files with 42 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
postgres/map.jinja
View File

@@ -1,3 +1,15 @@
{% set pg_version = salt['grains.filter_by']({
'RedHat' : { 'id': '9.1' },
'Arch' : { 'id': '9.1' },
'Debian' : { 'id': '9.3' },
}, merge=salt['grains.filter_by']({
'14.04' : { 'id': '9.3' },
'14.10' : { 'id': '9.4' },
}, grain='lsb_distrib_release', merge=salt['grains.filter_by']({
'jessie' : { 'id': '9.4' },
'wheezy' : { 'id': '9.1' },
}, grain='lsb_distrib_codename', merge=salt['pillar.get']('postgres:lookup')))) %}
{% set postgres = salt['grains.filter_by']({ {% set postgres = salt['grains.filter_by']({
'RedHat': { 'RedHat': {
'pkg' : 'postgresql-server', 'pkg' : 'postgresql-server',
@@ -8,7 +20,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', 'version' : pg_version.id,
}, },
'Arch': { 'Arch': {
'pkg' : 'postgresql', 'pkg' : 'postgresql',
@@ -19,48 +31,18 @@
'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', 'version' : pg_version.id,
}, },
}, merge=salt['grains.filter_by']({ 'Debian': {
'14.04': {
'pkg' : 'postgresql', 'pkg' : 'postgresql',
'pkg_dev': 'postgresql-server-dev-9.3', 'pkg_dev' : 'postgresql-server-dev-' + pg_version.id,
'conf_dir': '/etc/postgresql/9.3/main',
'service': 'postgresql',
'create_cluster': False,
'version': '9.3',
},
'14.10': {
'pkg': 'postgresql',
'pkg_dev': 'postgresql-server-dev-9.4',
'conf_dir': '/etc/postgresql/9.4/main',
'service': 'postgresql',
'create_cluster': False,
'version': '9.4',
},
}, grain='lsb_distrib_release', merge=salt['grains.filter_by']({
'jessie': {
'pkg': 'postgresql-9.4',
'pkg_dev': 'postgresql-server-dev-9.4',
'pkg_libpq_dev' : 'libpq-dev', 'pkg_libpq_dev' : 'libpq-dev',
'python' : 'python-pygresql', 'python' : 'python-pygresql',
'service' : 'postgresql', 'service' : 'postgresql',
'pg_hba': '/etc/postgresql/9.4/main/pg_hba.conf', 'pg_hba' : '/etc/postgresql/' + pg_version.id + '/main/pg_hba.conf',
'conf_dir': '/etc/postgresql/9.4/main', 'conf_dir' : '/etc/postgresql/' + pg_version.id + '/main',
'create_cluster' : False, 'create_cluster' : False,
'init_db' : False, 'init_db' : False,
'version': '9.4', 'version' : pg_version.id,
}, },
'wheezy': { }, merge=salt['pillar.get']('postgres:lookup')) %}
'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',
},
}, grain='lsb_distrib_codename', merge=salt['pillar.get']('postgres:lookup')))) %}