karel/postgres-formula
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #90 from tgoodaire/master

Browse Source 
Convert hard-coded postgres user and group to variables, enforce owne…
This commit is contained in:
Wolodja Wentland
2016-05-20 18:22:39 +02:00
parent aba8414809 e36478bcd6
commit e9e41eb12c
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postgres/defaults.yaml
View File

@@ -20,3 +20,5 @@ postgres:
pg_hba.conf: salt://postgres/pg_hba.conf pg_hba.conf: salt://postgres/pg_hba.conf
commands: commands:
initdb: service postgresql initdb initdb: service postgresql initdb
postgres_user: postgres
postgres_group: postgres

15
postgres/init.sls
View File

@@ -7,6 +7,8 @@ include:
{{ postgres.conf_dir }}: {{ postgres.conf_dir }}:
file.directory: file.directory:
- user: {{ postgres.postgres_user }}
- group: {{ postgres.postgres_group }}
- makedirs: True - makedirs: True
install-postgresql: install-postgresql:
@@ -71,11 +73,12 @@ pg_hba.conf:
- name: {{ postgres.conf_dir }}/pg_hba.conf - name: {{ postgres.conf_dir }}/pg_hba.conf
- source: {{ postgres['pg_hba.conf'] }} - source: {{ postgres['pg_hba.conf'] }}
- template: jinja - template: jinja
- user: postgres - user: {{ postgres.postgres_user }}
- group: postgres - group: {{ postgres.postgres_group }}
- mode: 644 - mode: 644
- require: - require:
- pkg: install-postgresql - pkg: install-postgresql
- onlyif: test -f {{ postgres.conf_dir }}/postgresql.conf
- watch_in: - watch_in:
- service: run-postgresql - service: run-postgresql
@@ -90,14 +93,14 @@ postgres-user-{{ name }}:
- inherit: {{ user.get('inherit', True) }} - inherit: {{ user.get('inherit', True) }}
- replication: {{ user.get('replication', False) }} - replication: {{ user.get('replication', False) }}
- password: {{ user.get('password', 'changethis') }} - password: {{ user.get('password', 'changethis') }}
- user: {{ user.get('runas', 'postgres') }} - user: {{ user.get('runas', postgres.postgres_user) }}
- superuser: {{ user.get('superuser', False) }} - superuser: {{ user.get('superuser', False) }}
- require: - require:
- service: run-postgresql - service: run-postgresql
{% else %} {% else %}
postgres_user.absent: postgres_user.absent:
- name: {{ name }} - name: {{ name }}
- user: {{ user.get('runas', 'postgres') }} - user: {{ user.get('runas', postgres.postgres_user) }}
- require: - require:
- service: run-postgresql - service: run-postgresql
{% endif %} {% endif %}
@@ -114,7 +117,7 @@ postgres-db-{{ name }}:
{% if db.get('owner') %} {% if db.get('owner') %}
- owner: {{ db.get('owner') }} - owner: {{ db.get('owner') }}
{% endif %} {% endif %}
- user: {{ db.get('runas', 'postgres') }} - user: {{ db.get('runas', postgres.postgres_user) }}
- require: - require:
- service: run-postgresql - service: run-postgresql
{% if db.get('user') %} {% if db.get('user') %}
@@ -140,7 +143,7 @@ postgres-schema-{{ schema }}-for-db-{{ name }}:
postgres-ext-{{ ext }}-for-db-{{ name }}: postgres-ext-{{ ext }}-for-db-{{ name }}:
postgres_extension.present: postgres_extension.present:
- name: {{ ext }} - name: {{ ext }}
- user: {{ db.get('runas', 'postgres') }} - user: {{ db.get('runas', postgres.postgres_user) }}
- maintenance_db: {{ name }} - maintenance_db: {{ name }}
{% if ext_args is not none %} {% if ext_args is not none %}
{% for arg, value in ext_args.items() %} {% for arg, value in ext_args.items() %}