Merge conflict resolution

sebalix · Jan 28, 2015 · 56f57bc · 56f57bc
2 parents 92dd45a + 9d9c328
commit 56f57bc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/tasks/databases.yml b/tasks/databases.yml
@@ -14,6 +14,9 @@
     lc_ctype: "{{postgresql_locale}}"
     template: "template0"
     state: present
+    login_user: "{{postgresql_admin_user}}"
+  sudo: yes
+  sudo_user: "{{postgresql_admin_user}}"
   with_items: postgresql_databases
   when: postgresql_databases|length > 0
 

diff --git a/tasks/users.yml b/tasks/users.yml
@@ -10,6 +10,21 @@
     name: "{{item.name}}"
     password: "{{item.pass | default('pass')}}"
     state: present
-    login_host: "{{item.host | default('localhost')}}"
+    login_user: "{{postgresql_admin_user}}"
+  sudo: yes
+  sudo_user: "{{postgresql_admin_user}}"
   with_items: postgresql_users
   when: postgresql_users|length > 0
+
+- name: PostgreSQL | Update the user privileges
+  postgresql_user:
+    name: "{{item.name}}"
+    db: "{{item.db}}"
+    priv: "{{item.priv | default('ALL')}}"
+    state: present
+    login_user: "{{postgresql_admin_user}}"
+  sudo: yes
+  sudo_user: "{{postgresql_admin_user}}"
+  with_items: postgresql_user_privileges
+  when: postgresql_users|length > 0
+