From 4030891045865053c9e5fc103bf400123d744698 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Thu, 5 Nov 2015 23:40:24 -0800 Subject: [PATCH] Fixing broken references --- postgres/init.sls | 14 +++++++------- postgres/upstream.sls | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/postgres/init.sls b/postgres/init.sls index 6d3e8d2..e43b38e 100644 --- a/postgres/init.sls +++ b/postgres/init.sls @@ -41,7 +41,7 @@ run-postgresql: - enable: true - name: {{ postgres.service }} - require: - - pkg: {{ postgres.pkg }} + - pkg: install-postgresql {% if postgres.pkg_contrib != False %} install-postgres-contrib: @@ -60,7 +60,7 @@ postgresql-conf: - show_changes: True - append_if_not_found: True - watch_in: - - service: postgresql + - service: run-postgresql {% endif %} pg_hba.conf: @@ -72,9 +72,9 @@ pg_hba.conf: - group: postgres - mode: 644 - require: - - pkg: {{ postgres.pkg }} + - pkg: install-postgresql - watch_in: - - service: postgresql + - service: run-postgresql {% for name, user in postgres.users.items() %} postgres-user-{{ name }}: @@ -90,13 +90,13 @@ postgres-user-{{ name }}: - user: {{ user.get('runas', 'postgres') }} - superuser: {{ user.get('superuser', False) }} - require: - - service: {{ postgres.service }} + - service: run-postgresql {% else %} postgres_user.absent: - name: {{ name }} - user: {{ user.get('runas', 'postgres') }} - require: - - service: {{ postgres.service }} + - service: run-postgresql {% endif %} {% endfor%} @@ -144,5 +144,5 @@ postgres-tablespace-{{ name }}: - name: {{ name }} - directory: {{ directory }} - require: - - service: {{ postgres.service }} + - service: run-postgresql {% endfor%} diff --git a/postgres/upstream.sls b/postgres/upstream.sls index 14ec148..f4adf06 100644 --- a/postgres/upstream.sls +++ b/postgres/upstream.sls @@ -9,6 +9,6 @@ install-postgresql-repo: - keyserver: keyserver.ubuntu.com - file: {{ postgres.pkg_repo_file }} - require_in: - - pkg: {{ postgres.pkg }} + - pkg: install-postgresql {% endif %}