From f858a99ebcbcf843fd7fa4b9c18598a9ec34d667 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 30 Jul 2020 15:00:07 +0200
Subject: [PATCH] Update to 2020-07-30 15:00

---
 roles/dokuwiki/defaults/main.yml                | 9 +++++----
 roles/dokuwiki/tasks/main.yml                   | 2 +-
 roles/dokuwiki/templates/local.protected.php.j2 | 5 ++++-
 roles/matrix_synapse/defaults/main.yml          | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/roles/dokuwiki/defaults/main.yml b/roles/dokuwiki/defaults/main.yml
index 40d866f..1587b6e 100644
--- a/roles/dokuwiki/defaults/main.yml
+++ b/roles/dokuwiki/defaults/main.yml
@@ -4,9 +4,9 @@
 dokuwiki_id: 1
 
 # Version to deploy
-dokuwiki_version: 2018-04-22b
+dokuwiki_version: 2020-07-29
 # The sha1 checksum of the archive
-dokuwiki_archive_sha1: da296531ee64d9bf8b3a5f0170e902ccc8c9f2a6
+dokuwiki_archive_sha1: 119f3875d023d15070068a6aca1e23acd7f9a19a
 
 # Root dir where the app will be installed. Each instance must have a different install path
 dokuwiki_root_dir: /opt/dokuwiki_{{ dokuwiki_id }}
@@ -154,7 +154,6 @@ dokuwiki_base_plugins_to_install:
   - loglog
   - changes
   - pagemove
-  - indexmenu
   - authorstats
   - note
 # An additional list, so you can just keep the default and add more if needed, in hosts_var
@@ -198,6 +197,8 @@ dokuwiki_ldap_group_key: cn
 dokuwiki_ad_dc: "{{ ad_ldap_servers | default(ansible_domain) }}"
 dokuwiki_ad_starttls: True
 dokuwiki_ad_user_base: "{{ ad_ldap_user_search_base | default('DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC=')) }}"
-# dokuwiki_ad_bind_dn:
+dokuwiki_ad_domain: "{{ samba_realm | default(ansible_domain) }}"
+# AD user. Do not use full DN notation, just simple login
+# dokuwiki_ad_bind_user:
 # dokuwiki_ad_bind_pass:
 ...
diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml
index 6f0b9eb..92b5d0f 100644
--- a/roles/dokuwiki/tasks/main.yml
+++ b/roles/dokuwiki/tasks/main.yml
@@ -119,7 +119,7 @@
   tags: dokuwiki
 
 - name: Check existing conf to restore
-  stat: path={{ dokuwiki_root_dir }}/archives/{{ dokuwiki_current_version }}/web/{{ item }}
+  stat: path={{ dokuwiki_root_dir }}/archives/{{ dokuwiki_current_version.stdout }}/web/{{ item }}
   with_items:
     - conf/local.php
     - conf/acl.auth.php
diff --git a/roles/dokuwiki/templates/local.protected.php.j2 b/roles/dokuwiki/templates/local.protected.php.j2
index b449cc6..a19a441 100644
--- a/roles/dokuwiki/templates/local.protected.php.j2
+++ b/roles/dokuwiki/templates/local.protected.php.j2
@@ -20,8 +20,11 @@ $conf['plugin']['{{ dokuwiki_auth }}']['bindpw'] = '{{ dokuwiki_ldap_bind_pass }
 {% elif dokuwiki_auth == 'authad' %}
 $conf['plugin']['authad']['base_dn'] = '{{ dokuwiki_ad_user_base }}';
 $conf['plugin']['authad']['domain_controllers'] = '{{ dokuwiki_ad_dc | join(', ') }}';
-$conf['plugin']['authad']['admin_username'] = '{{ dokuwiki_ad_bind_dn }}';
+$conf['plugin']['authad']['admin_username'] = '{{ dokuwiki_ad_bind_user }}';
 $conf['plugin']['authad']['admin_password'] = '{{ dokuwiki_ad_bind_pass }}';
+{% if dokuwiki_ad_domain is defined %}
+$conf['plugin']['authad']['account_suffix'] = '@{{ dokuwiki_ad_domain }}';
+{% endif %}
 $conf['plugin']['authad']['sso'] = 1;
 $conf['plugin']['authad']['use_tls'] = {{ dokuwiki_ad_starttls | ternary('1','0') }};
 $conf['plugin']['authad']['recursive_groups'] = 1;
diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml
index 99fa71c..7761670 100644
--- a/roles/matrix_synapse/defaults/main.yml
+++ b/roles/matrix_synapse/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 
 # Synapse version to deploy
-synapse_version: 1.17.0
+synapse_version: 1.18.0
 
 # Synapse install dir
 synapse_root_dir: /opt/matrix/synapse