From b6f588f0061eb8690a0116f8ac6b0ea35fd646cd Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Wed, 22 Dec 2021 11:56:04 +0100
Subject: [PATCH] [dhcp] new service

---
 .../routeur-daniel.adm.crans.org/dhcp.yml     | 20 ++++++++++++-------
 roles/service/templates/service/config.json   |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/host_vars/routeur-daniel.adm.crans.org/dhcp.yml b/host_vars/routeur-daniel.adm.crans.org/dhcp.yml
index d0960b80..e21a61db 100644
--- a/host_vars/routeur-daniel.adm.crans.org/dhcp.yml
+++ b/host_vars/routeur-daniel.adm.crans.org/dhcp.yml
@@ -15,13 +15,19 @@ loc_dhcp:
       lease_file: "/var/local/services/dhcp/generated/dhcp.adh.crans.org.list"
 
 loc_service_dhcp:
-  re2o:
-    hostname: "{{ query('ldap', 'ip', 'c3po', 'adm') | ipv4 | first }}"
-    user: services
-    password: "{{ vault.re2o_service_password }}"
   git:
     remote: https://gitlab.adm.crans.org/nounous/dhcp.git
-    version: master
+    version: main
+  cron:
+    frequency: "*/2 * * * *"
+    options: -r
   config:
-    extensions:
-      - adh.crans.org
+    ldap:
+      server: ldaps://flirt.adm.crans.org
+      binddn: "{{ vault.ldap_adh_reader.username }}"
+      bindpass: "{{ vault.ldap_adh_reader.password }}"
+      userdn: ou=users,dc=adh,dc=crans,dc=org
+      clubdn: ou=clubs,dc=adh,dc=crans,dc=org
+      hostdn: ou=hosts,dc=adh,dc=crans,dc=org
+    extension: adh.crans.org
+
diff --git a/roles/service/templates/service/config.json b/roles/service/templates/service/config.json
index 82839900..6cf83dac 100644
--- a/roles/service/templates/service/config.json
+++ b/roles/service/templates/service/config.json
@@ -1 +1 @@
-{{ service.config | to_nice_json }}
+{{ service.config | to_nice_json(sort_keys=False) }}