From 40e915a7e0af83b9e4aca78651de835d7b95d92e Mon Sep 17 00:00:00 2001 From: fpoutre Date: Sun, 22 Mar 2020 19:06:38 +0100 Subject: [PATCH] happy little mistakes --- hosts | 33 ++++++++++++----------- roles/ldap-client/templates/nslcd.conf.j2 | 6 ++--- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/hosts b/hosts index 7caec9b..2e83677 100644 --- a/hosts +++ b/hosts @@ -74,29 +74,29 @@ routeur-pacaterie.adm.auro.re routeur-pacaterie-backup.adm.auro.re [edc_pve] -#chapalux.adm.auro.re +chapalux.adm.auro.re [edc_vm] -#routeur-edc.adm.auro.re -#dns-edc.adm.auro.re -#dhcp-edc.adm.auro.re -#unifi-edc.adm.auro.re -#radius-edc.adm.auro.re -#routeur-aurore.adm.auro.re +routeur-edc.adm.auro.re +dns-edc.adm.auro.re +dhcp-edc.adm.auro.re +unifi-edc.adm.auro.re +radius-edc.adm.auro.re +routeur-aurore.adm.auro.re ldap-replica-edc.adm.auro.re -ldap-replica-edc-backup.adm.auro.re +#ldap-replica-edc-backup.adm.auro.re [gs_pve] #perceval.adm.auro.re [gs_vm] -#routeur-gs.adm.auro.re -#unifi-gs.adm.auro.re -#radius-gs.adm.auro.re -#dns-gs.adm.auro.re -#dhcp-gs.adm.auro.re -ldap-replica-gs.adm.auro.re -ldap-replica-gs-backup.adm.auro.re +routeur-gs.adm.auro.re +unifi-gs.adm.auro.re +radius-gs.adm.auro.re +dns-gs.adm.auro.re +dhcp-gs.adm.auro.re +#ldap-replica-gs.adm.auro.re +#ldap-replica-gs-backup.adm.auro.re # everything at ovh [ovh:children] @@ -137,6 +137,7 @@ ovh_container ovh_vm fleming_vm pacaterie_vm +edc_vm gs_vm # every PVE @@ -163,7 +164,7 @@ gs_pve #dns-edc.adm.auro.re #dns-gs.adm.auro.re -[ldap_replica] +[ldap_replica:children] ldap_replica_fleming ldap_replica_pacaterie ldap_replica_edc diff --git a/roles/ldap-client/templates/nslcd.conf.j2 b/roles/ldap-client/templates/nslcd.conf.j2 index bd256dc..1cb7856 100644 --- a/roles/ldap-client/templates/nslcd.conf.j2 +++ b/roles/ldap-client/templates/nslcd.conf.j2 @@ -7,7 +7,7 @@ gid nslcd # The location at which the LDAP server(s) should be reachable. {% if 'fleming_vm' in group_names or 'fleming_pve' in group_names %} {% for uri in groups['ldap_replica_fleming'] %} -uri {{ uri }} +uri ldap://{{ uri }} {% endfor %} {% endif %} {% if 'pacaterie_vm' in group_names or 'pacaterie_pve' in group_names %} @@ -17,12 +17,12 @@ uri ldap://{{ uri }} {% endif %} {% if 'edc_vm' in group_names or 'edc_pve' in group_names %} {% for uri in groups['ldap_replica_edc'] %} -uri {{ uri }} +uri ldap://{{ uri }} {% endfor %} {% endif %} {% if 'gs_vm' in group_names or 'gs_pve' in group_names %} {% for uri in groups['ldap_replica_gs'] %} -uri {{ uri }} +uri ldap://{{ uri }} {% endfor %} {% endif %} uri {{ ldap_master_uri }}