Merge pull request #13 from amcnea/master

Updated init.sls to use pillar.get and updated pillar.example
This commit is contained in:
Forrest 2014-07-13 14:18:36 -07:00
commit 90397cf555
2 changed files with 7 additions and 6 deletions

View file

@ -6,6 +6,7 @@
postgres: postgres:
lookup: lookup:
pkg: postgresql-9.3 pkg: postgresql-9.3
pg_hba: '/etc/postgresql/9.3/main/pg_hba.conf'
db: db:
name: mydb name: mydb
user: mydb user: mydb

View file

@ -15,7 +15,7 @@ postgresql:
pg_hba.conf: pg_hba.conf:
file.managed: file.managed:
- name: {{ postgres.pg_hba }} - name: {{ postgres.pg_hba }}
- source: {{ pillar['postgres']['pg_hba.conf'] }} - source: {{ salt['pillar.get']('postgres:pg_hba.conf', 'salt://postgres/pg_hba.conf') }}
- template: jinja - template: jinja
- user: postgres - user: postgres
- group: postgres - group: postgres
@ -29,21 +29,21 @@ pg_hba.conf:
{% if 'db' in pillar.get('postgres', {}) %} {% if 'db' in pillar.get('postgres', {}) %}
postgres-app-user: postgres-app-user:
postgres_user.present: postgres_user.present:
- name: {{ pillar['postgres']['db']['user'] }} - name: {{ salt['pillar.get']('postgres:db:user', 'myuser') }}
- createdb: {{ pillar['postgres']['db']['createdb'] }} - createdb: {{ salt['pillar.get']('postgres:db:createdb', False) }}
- password: {{ pillar['postgres']['db']['password'] }} - password: {{ salt['pillar.get']('postgres:db:password', 'mypass') }}
- runas: postgres - runas: postgres
- require: - require:
- service: {{ postgres.service }} - service: {{ postgres.service }}
postgres-app-db: postgres-app-db:
postgres_database.present: postgres_database.present:
- name: {{ pillar['postgres']['db']['name'] }} - name: {{ salt['pillar.get']('postgres:db:name', 'mydb') }}
- encoding: UTF8 - encoding: UTF8
- lc_ctype: en_US.UTF8 - lc_ctype: en_US.UTF8
- lc_collate: en_US.UTF8 - lc_collate: en_US.UTF8
- template: template0 - template: template0
- owner: {{ pillar['postgres']['db']['user'] }} - owner: {{ salt['pillar.get']('postgres:db:user', 'myuser') }}
- runas: postgres - runas: postgres
- require: - require:
- postgres_user: postgres-app-user - postgres_user: postgres-app-user