diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml index 078d181..0b022a8 100644 --- a/postgres/codenamemap.yaml +++ b/postgres/codenamemap.yaml @@ -35,6 +35,7 @@ prepare_cluster: pgcommand: pg_createcluster {{ version }} {{ cluster_name }} -d user: root + bake_image_run_cmd: pg_ctlcluster {{ version }} {{ cluster_name }} start {% endmacro %} diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml index 79c03be..a44ca36 100644 --- a/postgres/defaults.yaml +++ b/postgres/defaults.yaml @@ -76,6 +76,7 @@ postgres: sysrc: false bake_image: false + bake_image_run_cmd: echo "do nothing by default" fromrepo: '' diff --git a/postgres/server/image.sls b/postgres/server/image.sls index 67b2411..75bd8d9 100644 --- a/postgres/server/image.sls +++ b/postgres/server/image.sls @@ -10,15 +10,19 @@ include: # An attempt to start PostgreSQL with `pg_ctl` -postgresql-start: +postgresql-running: cmd.run: - - name: pg_ctl -D {{ postgres.data_dir }} -l logfile start + - name: {{ postgres.bake_image_run_cmd }} - runas: {{ postgres.user }} - unless: - ps -p $(head -n 1 {{ postgres.data_dir }}/postmaster.pid) 2>/dev/null - require: - file: postgresql-pg_hba +postgresql-service-reload: + test.show_notification: + - text: Imitating reload while baking an image + # Try to enable PostgreSQL in "manual" way postgresql-enable: @@ -34,11 +38,11 @@ postgresql-enable: - name: 'true' {%- endif %} - require: - - cmd: postgresql-start + - cmd: postgresql-running {%- else %} -postgresql-start: +postgresql-running: test.show_notification: - text: The 'postgres:bake_image' Pillar is disabled (set to 'False').