From 8561e2a55bf8e7b10105fb7d18ddd18630d4db0e Mon Sep 17 00:00:00 2001
From: Robin Schneider <ypid@riseup.net>
Date: Fri, 22 Jan 2016 16:28:12 +0100
Subject: [PATCH] Moved roles dependencies from debops.owncloud to owncloud
 playbook.

Related to https://github.com/debops/ansible-owncloud/pull/30
---
 CHANGELOG.rst                  |  4 +++-
 playbooks/service/owncloud.yml | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f51de62..e384565 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -43,7 +43,7 @@ v0.2.8
 
 - Update the Postfix, nginx and slapd playbooks to include the firewall and TCP
   Wrappers roles. OpenLDAP and nginx Ansible host groups have been renamed, you
-  will need to update the inventory. Postfix plybook is prepared to manage
+  will need to update the inventory. Postfix playbook is prepared to manage
   Postfix as standalone service, not part of the ``common.yml`` playbook.
   [drybjed]
 
@@ -77,6 +77,8 @@ v0.2.8
 
 - Update "Getting Started Guide" and parts of other documentation. [drybjed]
 
+- Moved roles dependencies from ``debops.owncloud`` to owncloud playbook. [ypid]
+
 v0.2.7
 ------
 
diff --git a/playbooks/service/owncloud.yml b/playbooks/service/owncloud.yml
index 0cd3f1d..300321e 100644
--- a/playbooks/service/owncloud.yml
+++ b/playbooks/service/owncloud.yml
@@ -6,6 +6,41 @@
 
   roles:
 
+    - role: debops.mariadb
+      tags: [ 'role::mariadb' ]
+      mariadb_users:
+        - database: '{{ owncloud_database_map[owncloud_database].dbname }}'
+          user: '{{ owncloud_database_map[owncloud_database].dbuser }}'
+          password: '{{ owncloud_database_map[owncloud_database].dbpass }}'
+      when: (owncloud_database == 'mariadb')
+
+    - role: debops.postgresql
+      postgresql_roles:
+        - name: '{{ owncloud_database_name }}' # Separate role is needed when owncloud_database_name != owncloud_database_user
+        - name: '{{ owncloud_database_user }}' # Password is not passed directly - it will be read for the file
+      postgresql_groups:
+        - roles: [ '{{ owncloud_database_user }}' ]
+          groups: [ '{{ owncloud_database_name }}' ]
+          database: '{{ owncloud_database_name }}'
+          enabled: '{{ owncloud_database_name != owncloud_database_user }}'
+      postgresql_databases:
+        - name: '{{ owncloud_database_name }}'
+          owner: '{{ owncloud_database_user }}'
+      when: (owncloud_database == 'postgresql')
+      tags: [ 'role::postgresql' ]
+
+    - role: debops.php5
+      tags: [ 'role::php5' ]
+      php5_pools:
+        - '{{ owncloud_php5_pool }}'
+
+    - role: debops.nginx
+      tags: [ 'role::nginx' ]
+      nginx_servers:
+        - '{{ owncloud_nginx_server }}'
+      nginx_upstreams:
+        - '{{ owncloud_nginx_upstream_php5 }}'
+
     - role: debops.owncloud
       tags: [ 'role::owncloud' ]