From 41d69e4f9631aa4f5e198b5ff5530c9060369b14 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 4 Apr 2022 16:33:04 +0200 Subject: [PATCH] [re2o-ldap] Fix replication configuration Signed-off-by: Yohann D'ANELLO --- plays/re2o-ldap.yml | 2 +- roles/re2o-ldap/tasks/main.yml | 2 +- roles/re2o-ldap/templates/ldap/replication.ldif.j2 | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plays/re2o-ldap.yml b/plays/re2o-ldap.yml index 33964e19..fcdd583e 100755 --- a/plays/re2o-ldap.yml +++ b/plays/re2o-ldap.yml @@ -4,4 +4,4 @@ vars: re2o_ldap: "{{ glob_re2o_ldap | default({}) | combine(loc_re2o_ldap | default({})) }}" roles: - - re2o-ldap-replica + - re2o-ldap diff --git a/roles/re2o-ldap/tasks/main.yml b/roles/re2o-ldap/tasks/main.yml index 687f1332..485cf7ff 100644 --- a/roles/re2o-ldap/tasks/main.yml +++ b/roles/re2o-ldap/tasks/main.yml @@ -77,7 +77,7 @@ state: started - name: Enable data replication - when: not installation.stat.exists and re2o_ldap.replica exists + when: not installation.stat.exists and re2o_ldap.replica is defined shell: ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /var/lib/slapd/replication.ldif # LDAPS configuration diff --git a/roles/re2o-ldap/templates/ldap/replication.ldif.j2 b/roles/re2o-ldap/templates/ldap/replication.ldif.j2 index 7065c260..7b74785c 100644 --- a/roles/re2o-ldap/templates/ldap/replication.ldif.j2 +++ b/roles/re2o-ldap/templates/ldap/replication.ldif.j2 @@ -1,5 +1,6 @@ {{ ansible_header | comment }} +{% if re2o_ldap.replica is defined %} dn: olcDatabase={1}hdb,cn=config changetype: modify add: olcSyncrepl @@ -19,3 +20,4 @@ olcSyncrepl: rid=1 - add: olcUpdateRef olcUpdateRef: {{ re2o_ldap.url }} +{% endif %}