Skip to content
Permalink
Browse files

Merge branch 'owncloud-ldap-integration' of https://github.com/drybje…

…d/debops into drybjed-owncloud-ldap-integration
  • Loading branch information...
drybjed committed Sep 27, 2019
2 parents d5c1968 + e680d1a commit b0ed70f69e01e74ef59f52995b2d4a9b2fd0ead0
@@ -119,6 +119,19 @@ General
manually if you are running 14 or below. Add Nextcloud 16 support. Now
default to Nextcloud 15 for new installations.

- The LDAP support in Nextcloud has been converted to use the
:ref:`debops.ldap` infrastructure and not configure LDAP objects directly.
LDAP support in Nextcloud will be enabled automatically if it's enabled on
the host. Some of the configuration variables have been changed; see the
:ref:`upgrade_notes` for more details.

- The default LDAP filter configured in the
:envvar:`owncloud__ldap_login_filter` variable has been modified to limit
access to the service to objects with specific attributes. See the
:ref:`Nextcloud LDAP access control <owncloud__ref_ldap_dit_access>`
documentation page for details about the required attributes and their
values.

:ref:`debops.resolvconf` role
'''''''''''''''''''''''''''''

@@ -42,22 +42,29 @@
- '{{ apache__ferm__dependent_rules }}'

- role: debops.python
tags: [ 'role::python', 'skip::python' ]
tags: [ 'role::python', 'skip::python', 'role::ldap' ]
python__dependent_packages3:
- '{{ ldap__python__dependent_packages3 }}'
- '{{ mariadb__python__dependent_packages3
if (owncloud__database == "mariadb")
else [] }}'
- '{{ postgresql__python__dependent_packages3
if (owncloud__database == "postgresql")
else [] }}'
python__dependent_packages2:
- '{{ ldap__python__dependent_packages2 }}'
- '{{ mariadb__python__dependent_packages2
if (owncloud__database == "mariadb")
else [] }}'
- '{{ postgresql__python__dependent_packages2
if (owncloud__database == "postgresql")
else [] }}'

- role: debops.ldap
tags: [ 'role::ldap', 'skip::ldap' ]
ldap__dependent_tasks:
- '{{ owncloud__ldap__dependent_tasks }}'

- role: debops.mariadb
tags: [ 'role::mariadb', 'skip::mariadb' ]
mariadb__dependent_users: '{{ owncloud__mariadb__dependent_users }}'
@@ -42,8 +42,9 @@
- '{{ nginx__ferm__dependent_rules }}'

- role: debops.python
tags: [ 'role::python', 'skip::python' ]
tags: [ 'role::python', 'skip::python', 'role::ldap' ]
python__dependent_packages3:
- '{{ ldap__python__dependent_packages3 }}'
- '{{ mariadb__python__dependent_packages3
if (owncloud__database == "mariadb")
else [] }}'
@@ -52,6 +53,7 @@
else [] }}'
- '{{ nginx__python__dependent_packages3 }}'
python__dependent_packages2:
- '{{ ldap__python__dependent_packages2 }}'
- '{{ mariadb__python__dependent_packages2
if (owncloud__database == "mariadb")
else [] }}'
@@ -60,6 +62,11 @@
else [] }}'
- '{{ nginx__python__dependent_packages2 }}'

- role: debops.ldap
tags: [ 'role::ldap', 'skip::ldap' ]
ldap__dependent_tasks:
- '{{ owncloud__ldap__dependent_tasks }}'

- role: debops.mariadb
tags: [ 'role::mariadb', 'skip::mariadb' ]
mariadb__dependent_databases: '{{ owncloud__mariadb__dependent_databases }}'

0 comments on commit b0ed70f

Please sign in to comment.
You can’t perform that action at this time.