- Added initdb_user configuration, renamed postgres_user and postgres_group to user and group

- Corrected inadvertent changes to postgres_user
- Fixed postgres_user
- Explicitly list the grain that we're filtering by even though it's
  default
- Place *BSD user and runas into osmap instead of hardcoding

postgres/init.sls

@@ -7,8 +7,8 @@ include:
 
 {{ postgres.conf_dir }}:
   file.directory:
-    - user: {{ postgres.postgres_user }}
-    - group: {{ postgres.postgres_group }}
+    - user: {{ postgres.user }}
+    - group: {{ postgres.group }}
     - makedirs: True
 
 install-postgresql:
@@ -31,7 +31,7 @@ create-postgresql-cluster:
 postgresql-initdb:
   cmd.run:
     - cwd: /
-    - user: root
+    - user: {{ postgres.initdb_user }}
     - name: {{ postgres.commands.initdb }}
     - unless: test -f {{ postgres.conf_dir }}/postgresql.conf
     - env:
@@ -73,8 +73,8 @@ pg_hba.conf:
     - name: {{ postgres.conf_dir }}/pg_hba.conf
     - source: {{ postgres['pg_hba.conf'] }}
     - template: jinja
-    - user: {{ postgres.postgres_user }}
-    - group: {{ postgres.postgres_group }}
+    - user: {{ postgres.user }}
+    - group: {{ postgres.group }}
     - mode: 644
     - require:
       - pkg: install-postgresql
@@ -93,14 +93,14 @@ postgres-user-{{ name }}:
     - inherit: {{ user.get('inherit', True) }}
     - replication: {{ user.get('replication', False) }}
     - password: {{ user.get('password', 'changethis') }}
-    - user: {{ user.get('runas', postgres.postgres_user) }}
+    - user: {{ user.get('runas', postgres.user) }}
     - superuser: {{ user.get('superuser', False) }}
     - require:
       - service: run-postgresql
 {% else %}
   postgres_user.absent:
     - name: {{ name }}
-    - user: {{ user.get('runas', postgres.postgres_user) }}
+    - user: {{ user.get('runas', postgres.user) }}
     - require:
       - service: run-postgresql
 {% endif %}
@@ -117,7 +117,7 @@ postgres-db-{{ name }}:
     {% if db.get('owner') %}
     - owner: {{ db.get('owner') }}
     {% endif %}
-    - user: {{ db.get('runas', postgres.postgres_user) }}
+    - user: {{ db.get('runas', postgres.user) }}
     - require:
         - service: run-postgresql
     {% if db.get('user') %}
@@ -143,7 +143,7 @@ postgres-schema-{{ schema }}-for-db-{{ name }}:
 postgres-ext-{{ ext }}-for-db-{{ name }}:
   postgres_extension.present:
     - name: {{ ext }}
-    - user: {{ db.get('runas', postgres.postgres_user) }}
+    - user: {{ db.get('runas', postgres.user) }}
     - maintenance_db: {{ name }}
 {% if ext_args is not none %}
 {% for arg, value in ext_args.items() %}