Merge conflict resolution

sebalix · Jan 28, 2015 · 6345cc8 · 6345cc8
2 parents 78b1463 + c201464
commit 6345cc8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -15,6 +15,7 @@ postgresql_service_group: "{{ postgresql_admin_user }}"
 postgresql_cluster_name: "main"
 postgresql_cluster_reset: false
 
+postgresql_database_owner: "{{ postgresql_admin_user }}"
 # Extensions
 postgresql_ext_install_contrib: no
 postgresql_ext_install_dev_headers: no

diff --git a/tasks/databases.yml b/tasks/databases.yml
@@ -8,6 +8,7 @@
 - name: PostgreSQL | Make sure the PostgreSQL databases are present
   postgresql_db:
     name: "{{item.name}}"
+    owner: "{{postgresql_database_owner}}"
     encoding: "{{postgresql_encoding}}"
     lc_collate: "{{postgresql_locale}}"
     lc_ctype: "{{postgresql_locale}}"

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -7,6 +7,7 @@
   tags: [postgresql, postgresql-extensions]
 
 - include: configure.yml
+<<<<<<< HEAD
   tags: [postgresql, postgresql-configure]
 
 - include: databases.yml
@@ -15,6 +16,11 @@
 - include: users.yml
   tags: [postgresql, postgresql-users]
 
+=======
+- include: users.yml
+- include: databases.yml
+- include: users_priv.yml
+>>>>>>> c20146400af29681dc4faed4d6744e74bd6aacd6
 - include: monit.yml
   when: monit_protection is defined and monit_protection == true
   tags: [postgresql, postgresql-monit]
diff --git a/tasks/users.yml b/tasks/users.yml
@@ -13,13 +13,3 @@
     login_host: "{{item.host | default('localhost')}}"
   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_host: "{{item.host | default('localhost')}}"
-  with_items: postgresql_user_privileges
-  when: postgresql_users|length > 0
diff --git a/tasks/users_privileges.yml b/tasks/users_privileges.yml
@@ -0,0 +1,11 @@
+# file: postgresql/tasks/users_privileges.yml
+
+- name: PostgreSQL | Update the user privileges
+  postgresql_user:
+    name: "{{item.name}}"
+    db: "{{item.db}}"
+    priv: "{{item.priv | default('ALL')}}"
+    state: present
+    login_host: "{{item.host | default('localhost')}}"
+  with_items: postgresql_user_privileges
+  when: postgresql_users|length > 0