From 8ddfbd24035909d3f0473667739a7ab3e1483d9c Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 6 Jun 2016 14:13:47 +0200 Subject: [PATCH 1/4] Add codenamemap entry for Ubuntu Wily Werewolf --- postgres/codenamemap.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml index edeab12..8015f90 100644 --- a/postgres/codenamemap.yaml +++ b/postgres/codenamemap.yaml @@ -24,6 +24,10 @@ vivid: version: 9.4 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main conf_dir: /etc/postgresql/9.4/main +wily: + version: 9.4 + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wily-pgdg main + conf_dir: /etc/postgresql/9.4/main xenial: version: 9.5 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main From 4a00acf26a70de6788ab5a9b9bc8871f6dc1f6fb Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 6 Jun 2016 14:28:31 +0200 Subject: [PATCH 2/4] Split postgresql-cluster-prepared in two states, refs: #100 Previous write up lead the two pillar settings overwriting each other in the same state. We can now properly select whether to create a cluster and/or initialize a new database. Also the commands will not fail if both settings are false as found on Debian family OSes as this is taken care of by the packaging system for main cluster. --- postgres/init.sls | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/postgres/init.sls b/postgres/init.sls index 2dfe606..b0d1347 100644 --- a/postgres/init.sls +++ b/postgres/init.sls @@ -32,17 +32,30 @@ postgresql-cluster-prepared: {% if postgres.create_cluster != False %} - user: root - name: pg_createcluster {{ postgres.version }} main +{% else %} + - name: test -f {{ postgres.conf_dir }}/environment +{% endif %} - unless: - test -f {{ postgres.conf_dir }}/environment -{% endif %} + - require: + - pkg: postgresql-installed + - env: + LC_ALL: C.UTF-8 + +postgresql-db-prepared: + cmd.run: {% if postgres.init_db != False %} - user: {{ postgres.initdb_user }} - name: {{ postgres.commands.initdb }} {{ postgres.initdb_args }} -D {{ postgres.data_dir }} + +{% else %} + - name: test -f {{ postgres.data_dir }}/PG_VERSION +{% endif %} - unless: - test -f {{ postgres.data_dir }}/PG_VERSION -{% endif %} - require: - pkg: postgresql-installed + - cmd: postgresql-cluster-prepared - env: LC_ALL: C.UTF-8 @@ -54,6 +67,7 @@ postgresql-running: - reload: true - require: - cmd: postgresql-cluster-prepared + - cmd: postgresql-db-prepared {% if postgres.pkgs_extra %} postgresql-extra-pkgs-installed: From ddf0e4733bf23977272b73dd1b5ec091a9a99702 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 6 Jun 2016 14:30:03 +0200 Subject: [PATCH 3/4] Set datadir for Debian family OSes, refs: #100 --- postgres/codenamemap.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml index 8015f90..2d3ad88 100644 --- a/postgres/codenamemap.yaml +++ b/postgres/codenamemap.yaml @@ -2,33 +2,41 @@ precise: version: 9.4 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main conf_dir: /etc/postgresql/9.4/main + data_dir: /var/lib/postgresql/9.4/main pkg_dev: postgresql-server-dev-9.4 wheezy: pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main conf_dir: /etc/postgresql/9.1/main + data_dir: /var/lib/postgresql/9.1/main pkg_dev: postgresql-server-dev-9.1 jessie: version: 9.4 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main conf_dir: /etc/postgresql/9.4/main + data_dir: /var/lib/postgresql/9.4/main pkg_dev: postgresql-server-dev-9.4 trusty: version: 9.3 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main conf_dir: /etc/postgresql/9.3/main + data_dir: /var/lib/postgresql/9.3/main utopic: version: 9.4 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main conf_dir: /etc/postgresql/9.4/main + data_dir: /var/lib/postgresql/9.4/main vivid: version: 9.4 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main conf_dir: /etc/postgresql/9.4/main + data_dir: /var/lib/postgresql/9.4/main wily: version: 9.4 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wily-pgdg main conf_dir: /etc/postgresql/9.4/main + data_dir: /var/lib/postgresql/9.4/main xenial: version: 9.5 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main conf_dir: /etc/postgresql/9.5/main + data_dir: /var/lib/postgresql/9.5/main From 6ab619f8c5fcd07b6d17922a58d43e4c30acf544 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 6 Jun 2016 14:44:44 +0200 Subject: [PATCH 4/4] Set pkg_dev for all debian variants --- postgres/codenamemap.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml index 2d3ad88..6e30c41 100644 --- a/postgres/codenamemap.yaml +++ b/postgres/codenamemap.yaml @@ -20,23 +20,28 @@ trusty: pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main conf_dir: /etc/postgresql/9.3/main data_dir: /var/lib/postgresql/9.3/main + pkg_dev: postgresql-server-dev-9.3 utopic: version: 9.4 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main conf_dir: /etc/postgresql/9.4/main data_dir: /var/lib/postgresql/9.4/main + pkg_dev: postgresql-server-dev-9.4 vivid: version: 9.4 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main conf_dir: /etc/postgresql/9.4/main data_dir: /var/lib/postgresql/9.4/main + pkg_dev: postgresql-server-dev-9.4 wily: version: 9.4 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wily-pgdg main conf_dir: /etc/postgresql/9.4/main data_dir: /var/lib/postgresql/9.4/main + pkg_dev: postgresql-server-dev-9.4 xenial: version: 9.5 pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main conf_dir: /etc/postgresql/9.5/main data_dir: /var/lib/postgresql/9.5/main + pkg_dev: postgresql-server-dev-9.5