From 1eba54f3ec41eb6cd67e71300d9fcc36060c68ae Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Sun, 17 Jan 2021 20:59:45 +0100
Subject: [PATCH] =?UTF-8?q?[ntp-client]=20On=20continue=20=C3=A0=20PEPCRAN?=
 =?UTF-8?q?SIFIER?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 group_vars/server/ntp.yml                            |  3 +++
 hosts                                                |  4 ++++
 plays/root.yml                                       |  5 +----
 roles/ntp-client/tasks/main.yml                      | 11 +++++------
 roles/ntp-client/templates/systemd/timesyncd.conf.j2 |  2 ++
 5 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 group_vars/server/ntp.yml
 create mode 100644 roles/ntp-client/templates/systemd/timesyncd.conf.j2

diff --git a/group_vars/server/ntp.yml b/group_vars/server/ntp.yml
new file mode 100644
index 00000000..5b27f698
--- /dev/null
+++ b/group_vars/server/ntp.yml
@@ -0,0 +1,3 @@
+glob_ntp_client:
+  servers:
+    - charybde.adm.crans.org
diff --git a/hosts b/hosts
index 98de0fe4..09bf66fe 100644
--- a/hosts
+++ b/hosts
@@ -76,6 +76,10 @@ fluxx.adm.crans.org
 [nginx:children]
 reverseproxy
 
+[ntp_server]
+charybde.adm.crans.org
+# silice.adm.crans.org
+
 [postfix]
 mailman.adm.crans.org
 redisdead.adm.crans.org
diff --git a/plays/root.yml b/plays/root.yml
index 2b3d83c3..a2b968d9 100755
--- a/plays/root.yml
+++ b/plays/root.yml
@@ -33,10 +33,7 @@
     # # Will be in /usr/scripts/
     # crans_scripts_git: "http://gitlab.adm.crans.org/nounous/scripts.git"
 
-    # NTP servers
-    ntp_servers:
-      - charybde.adm.crans.org
-    #   - silice.adm.crans.org
+    ntp_client: '{{ glob_ntp_client | combine(loc_ntp_client | default({})) }}'
   roles:
     - debian-apt-sources
     - common-tools
diff --git a/roles/ntp-client/tasks/main.yml b/roles/ntp-client/tasks/main.yml
index 8d2c04d1..a6006762 100644
--- a/roles/ntp-client/tasks/main.yml
+++ b/roles/ntp-client/tasks/main.yml
@@ -7,12 +7,11 @@
   register: apt_result
   retries: 3
   until: apt_result is succeeded
-  when: inventory_hostname not in ntp_servers
+  when: "'ntp_server' not in group_names"
 
 - name: Configure NTP
-  lineinfile:
-    path: /etc/systemd/timesyncd.conf
-    regexp: '^NTP='
-    line: "NTP={{ ntp_servers | join(' ') }}"
+  template:
+    src: systemd/timesyncd.conf.j2
+    dest: /etc/systemd/timesyncd.conf
   notify: Restart systemd-timesyncd
-  when: inventory_hostname not in ntp_servers
+  when: "'ntp_server' not in group_names"
diff --git a/roles/ntp-client/templates/systemd/timesyncd.conf.j2 b/roles/ntp-client/templates/systemd/timesyncd.conf.j2
new file mode 100644
index 00000000..ffef2b8b
--- /dev/null
+++ b/roles/ntp-client/templates/systemd/timesyncd.conf.j2
@@ -0,0 +1,2 @@
+[Time]
+NTP={{ ntp_client.servers | join(' ') }}