From 6ea3305c93df4a4d72900c386e477e2a3145c56f Mon Sep 17 00:00:00 2001
From: Sven Velt <sven@velt.de>
Date: Wed, 2 Dec 2020 21:55:22 +0100
Subject: [PATCH] Small improvemnts, distribution independent

---
 roles/timesync-enabled/handlers/main.yml         |  2 +-
 roles/timesync-enabled/tasks/main.yml            | 16 ++++++++++++----
 roles/timesync-enabled/templates/etc/ntp.conf.j2 |  2 +-
 .../templates/etc/systemd/timesyncd.conf.j2      |  4 ++--
 roles/timesync-enabled/vars/os_debian.yml        |  3 +++
 roles/timesync-enabled/vars/os_default.yml       |  3 +++
 roles/timesync-enabled/vars/os_devuan.yml        |  1 +
 7 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 roles/timesync-enabled/vars/os_debian.yml
 create mode 100644 roles/timesync-enabled/vars/os_default.yml
 create mode 120000 roles/timesync-enabled/vars/os_devuan.yml

diff --git a/roles/timesync-enabled/handlers/main.yml b/roles/timesync-enabled/handlers/main.yml
index 2d5e58c..050e846 100644
--- a/roles/timesync-enabled/handlers/main.yml
+++ b/roles/timesync-enabled/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Restart NTP
   service:
-    name: ntp
+    name: '{{ ntp_service_name }}'
     state: restarted
 
 
diff --git a/roles/timesync-enabled/tasks/main.yml b/roles/timesync-enabled/tasks/main.yml
index 57a980b..14fdd96 100644
--- a/roles/timesync-enabled/tasks/main.yml
+++ b/roles/timesync-enabled/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: Check selected  timesync daemon
+  fail:
+    fail_msg: "{{ timesync_daemon|default('No daemon') }} not supported"
+  when: timesync_daemon not in [ "ntp", "timesyncd" ]
+
+
 - name: Include each network variables if there is no host variable
   include_vars: "vars/timesync_{{ ansible_default_ipv4.network }}.yml"
   when: ansible_default_ipv4 and timesync_servers is not defined
@@ -10,11 +16,13 @@
   when: timesync_servers is not defined
 
 
-- include_tasks: timesync_timesyncd.yml
-  when: timesync_daemon == "timesyncd"
+- name: Include OS dependent variables
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "os_{{ (ansible_os_family|lower).split(' ')[0] }}.yml"
+    - "os_defaut.yml"
 
 
-- include_tasks: timesync_ntp.yml
-  when: timesync_daemon not in ["timesyncd", ]
+- include_tasks: "timesync_{{ timesync_daemon }}.yml"
 
 
diff --git a/roles/timesync-enabled/templates/etc/ntp.conf.j2 b/roles/timesync-enabled/templates/etc/ntp.conf.j2
index 71369d0..c0edc60 100644
--- a/roles/timesync-enabled/templates/etc/ntp.conf.j2
+++ b/roles/timesync-enabled/templates/etc/ntp.conf.j2
@@ -12,7 +12,7 @@ filegen peerstats file peerstats type day enable
 filegen clockstats file clockstats type day enable
 
 # NTP server pool
-{% for server in timesync_servers %}server {{ server }} iburst
+{% for server in timesync_servers|default(["pool.ntp.org"]) %}server {{ server }} iburst
 {% endfor %}
 
 
diff --git a/roles/timesync-enabled/templates/etc/systemd/timesyncd.conf.j2 b/roles/timesync-enabled/templates/etc/systemd/timesyncd.conf.j2
index e0b9011..7947d86 100644
--- a/roles/timesync-enabled/templates/etc/systemd/timesyncd.conf.j2
+++ b/roles/timesync-enabled/templates/etc/systemd/timesyncd.conf.j2
@@ -3,8 +3,8 @@
 # See timesyncd.conf(5) for details.
 
 [Time]
-NTP={% for server in timesync_servers %}{{ server }} {% endfor %}
-{% if timesync_servers_fallback|default([]) %}FallbackNTP={% for server in timesync_servers_fallback %}{{ server }} {% endfor %}
+NTP={{ timesync_servers|default([])|join(' ') }}
+{% if timesync_servers_fallback|default([]) %}FallbackNTP={{ timesync_servers_fallback|join(' ') }}
 {% else %}#FallbackNTP=
 {% endif %}
 
diff --git a/roles/timesync-enabled/vars/os_debian.yml b/roles/timesync-enabled/vars/os_debian.yml
new file mode 100644
index 0000000..065ff8a
--- /dev/null
+++ b/roles/timesync-enabled/vars/os_debian.yml
@@ -0,0 +1,3 @@
+---
+ntp_service_name: ntp
+
diff --git a/roles/timesync-enabled/vars/os_default.yml b/roles/timesync-enabled/vars/os_default.yml
new file mode 100644
index 0000000..177ec54
--- /dev/null
+++ b/roles/timesync-enabled/vars/os_default.yml
@@ -0,0 +1,3 @@
+---
+ntp_service_name: ntpd
+
diff --git a/roles/timesync-enabled/vars/os_devuan.yml b/roles/timesync-enabled/vars/os_devuan.yml
new file mode 120000
index 0000000..8a72669
--- /dev/null
+++ b/roles/timesync-enabled/vars/os_devuan.yml
@@ -0,0 +1 @@
+os_debian.yml
\ No newline at end of file