From 1b9c546adb732310f47b3131267a0892949bd345 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 15 Mar 2021 20:00:05 +0100
Subject: [PATCH] Update to 2021-03-15 20:00

---
 roles/dokuwiki/defaults/main.yml | 6 +++---
 roles/matomo/defaults/main.yml   | 4 ++--
 roles/repo_remi/tasks/main.yml   | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/roles/dokuwiki/defaults/main.yml b/roles/dokuwiki/defaults/main.yml
index 050a6c4..db6a2bf 100644
--- a/roles/dokuwiki/defaults/main.yml
+++ b/roles/dokuwiki/defaults/main.yml
@@ -183,10 +183,10 @@ dokuwiki_remove_unmanaged_tpl: True
 dokuwiki_auth: "{{  ad_auth | default(False) | ternary('authad', ldap_auth | default(False) | ternary('authhttpldap', 'authplain')) }}"
 
 # LDAP Auth settings
-dokuwiki_ldap_uri: "{{ ldap_uri }}"
+dokuwiki_ldap_uri: "{{ ldap_uri | default('ldap://ldap.' ~ ansible_domain) }}"
 dokuwiki_ldap_starttls: True
-dokuwiki_ldap_user_base: "{{ ldap_user_base + ',' + ldap_base }}"
-dokuwiki_ldap_group_base: "{{ ldap_group_base + ',' + ldap_base }}"
+dokuwiki_ldap_user_base: "{{ ldap_user_base | default('ou=Users') + ',' + ldap_base | default(ansible_domain | regex_replace('\\.',',dc=')) }}"
+dokuwiki_ldap_group_base: "{{ ldap_group_base | default('ou=Groups') + ',' + ldap_base | default(ansible_domain | regex_replace('\\.',',dc=')) }}"
 dokuwiki_ldap_user_filter: '(&(uid=%{user})(objectClass=inetOrgPerson))'
 dokuwiki_ldap_group_filter: '(&(objectClass=posixGroup)(memberUid=%{user}))'
 dokuwiki_ldap_group_key: cn
diff --git a/roles/matomo/defaults/main.yml b/roles/matomo/defaults/main.yml
index b3e182e..facbf50 100644
--- a/roles/matomo/defaults/main.yml
+++ b/roles/matomo/defaults/main.yml
@@ -31,10 +31,10 @@ matomo_ldap_base:
   enabled: "{{ (ldap_auth | default(False) or ad_auth | default(False)) | ternary(True,False) }}"
   use_ldap_for_authentication: 1
   use_webserver_auth: 1
-  hostname: "{{ ad_auth | default(False) | ternary('ldaps://' + ad_realm | default(samba_realm) | default(ansible_domain) | lower, ldap_uri | regex_replace('^ldap://(.*)','ldaps://\\1')) }}"
+  hostname: "{{ ad_auth | default(False) | ternary('ldaps://' + ad_realm | default(samba_realm) | default(ansible_domain) | lower, ldap_uri | default('ldap://ldap' ~ ansible_domain) | regex_replace('^ldap://(.*)','ldaps://\\1')) }}"
   port: ""
   ldap_user_filter: "{{ ad_auth | default(False) | ternary('(&(objectCategory=person)(objectClass=user)(primaryGroupId=513))',ldap_user_object_class | default('(objectClass=inetOrgPerson)')) }}"
-  base_dn: "{{ ad_auth | default(False) | ternary((ad_ldap_user_search_base is defined) | ternary(ad_ldap_user_search_base,'DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC=')), ldap_user_base + ',' + ldap_base) }}"
+  base_dn: "{{ ad_auth | default(False) | ternary((ad_ldap_user_search_base is defined) | ternary(ad_ldap_user_search_base,'DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC=')), ldap_user_base | default('ou=Users') + ',' + ldap_base | default(ansible_domain | regex_replace('\\.',',dc='))) }}"
   ldap_user_id_field: "{{ ad_auth | default(False) | ternary('sAMAccountName', 'uid') }}"
   ldap_alias_field: cn
   ldap_last_name_field: sn
diff --git a/roles/repo_remi/tasks/main.yml b/roles/repo_remi/tasks/main.yml
index d4ff390..92a3907 100644
--- a/roles/repo_remi/tasks/main.yml
+++ b/roles/repo_remi/tasks/main.yml
@@ -19,6 +19,7 @@
     baseurl: http://rpms.remirepo.net/enterprise/$releasever/remi/$basearch/
     gpgcheck: True
     gpgkey: "{{ repo_remi_gpg_url }}"
+    exclude: "{{ (ansible_distribution_major_version is version('8','<')) | ternary('composer,php-symfony*','') }}"
   tags: repo
 
 # Note : we use a template here because yum_repository doesn't support module_hotfix attribute