saltstack-formulas/postgres-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/postgres-formula.git synced 2025-04-17 10:10:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove duplication in map.jinja

Browse source 
This change addresses #26 by consolidating Ubuntu and Debian
configuration back under the 'Debian' os_family grain.

The main difference between the various Ubuntu and Debian versions is
the version of postgresql in use; package/service names and directory
patterns are identical. This change separates the version number into
its own pg_version dictionary, which is used as needed by the postgres
dictionary.
This commit is contained in:
Will Saxon 2014-12-31 16:58:41 -05:00
parent 6173593c35
commit a58f153fb1
1 changed files with 42 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
postgres/map.jinja
View file

@ -1,66 +1,48 @@
{% 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',
'pkg_dev': 'postgresql-devel', 'pkg_dev' : 'postgresql-devel',
'pkg_libpq_dev': 'postgresql-libs', 'pkg_libpq_dev' : 'postgresql-libs',
'python': 'python-psycopg2', 'python' : 'python-psycopg2',
'service': 'postgresql', 'service' : 'postgresql',
'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',
'pkg_dev': 'postgresql-devel', 'pkg_dev' : 'postgresql-devel',
'pkg_libpq_dev': 'postgresql-libs', 'pkg_libpq_dev' : 'postgresql-libs',
'python': 'python-psycopg2', 'python' : 'python-psycopg2',
'service': 'postgresql', 'service' : 'postgresql',
'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-' + pg_version.id,
'pkg_dev': 'postgresql-server-dev-9.3', 'pkg_libpq_dev' : 'libpq-dev',
'conf_dir': '/etc/postgresql/9.3/main', 'python' : 'python-pygresql',
'service': 'postgresql', 'service' : 'postgresql',
'create_cluster': False, 'pg_hba' : '/etc/postgresql/' + pg_version.id + '/main/pg_hba.conf',
'version': '9.3', 'conf_dir' : '/etc/postgresql/' + pg_version.id + '/main',
'create_cluster' : False,
'init_db' : False,
'version' : pg_version.id,
}, },
'14.10': { }, merge=salt['pillar.get']('postgres:lookup')) %}
'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',
'python': 'python-pygresql',
'service': 'postgresql',
'pg_hba': '/etc/postgresql/9.4/main/pg_hba.conf',
'conf_dir': '/etc/postgresql/9.4/main',
'create_cluster': False,
'init_db': False,
'version': '9.4',
},
'wheezy': {
'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')))) %}