Update to 2021-03-15 20:00

master
Daniel Berteaud 4 years ago
parent 40f6f5b999
commit 1b9c546adb
  1. 6
      roles/dokuwiki/defaults/main.yml
  2. 4
      roles/matomo/defaults/main.yml
  3. 1
      roles/repo_remi/tasks/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

@ -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

@ -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

Loading…
Cancel
Save