diff --git a/pillar.example b/pillar.example index 3cb072d..3f34787 100644 --- a/pillar.example +++ b/pillar.example @@ -8,6 +8,9 @@ postgres: lookup: pkg: 'postgresql-9.3' pkg_client: 'postgresql-client-9.3' + pkgs_extra: + - postgresql-contrib + - postgresql-plpython pg_hba: '/etc/postgresql/9.3/main/pg_hba.conf' users: diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml index a81db3c..68be623 100644 --- a/postgres/defaults.yaml +++ b/postgres/defaults.yaml @@ -3,7 +3,7 @@ postgres: pkg_dev: postgresql-devel pkg_libpq_dev: postgresql-libs pkg_client: postgresql-client - pkg_contrib: postgresql-contrib + pkgs_extra: python: python-psycopg2 service: postgresql conf_dir: /var/lib/pgsql/data diff --git a/postgres/init.sls b/postgres/init.sls index e8559b3..92432b4 100644 --- a/postgres/init.sls +++ b/postgres/init.sls @@ -43,10 +43,10 @@ run-postgresql: - require: - pkg: install-postgresql -{% if postgres.pkg_contrib != False %} -install-postgres-contrib: +{% if postgres.pkgs_extra %} +install-postgres-extra: pkg.installed: - - name: {{ postgres.pkg_contrib }} + - pkgs: {{ postgres.pkgs_extra }} {% endif %} {% if postgres.postgresconf %}