Skip to content

Commit

Permalink
Moved roles dependencies from debops.owncloud to owncloud playbook.
Browse files Browse the repository at this point in the history
  • Loading branch information
ypid committed Jan 22, 2016
1 parent 4fa6be2 commit 8561e2a
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down Expand Up @@ -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
------

Expand Down
35 changes: 35 additions & 0 deletions playbooks/service/owncloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' ]

0 comments on commit 8561e2a

Please sign in to comment.