From 7046e193e054a05ccc5996d653a67a09c142d929 Mon Sep 17 00:00:00 2001
From: Jeremy Dubois <jdubois@evolix.fr>
Date: Mon, 19 Jul 2021 15:25:17 +0200
Subject: [PATCH] Configure the ntpd.conf file and bump version

---
 CHANGELOG                    |  6 ++++++
 README.md                    |  2 +-
 roles/base/defaults/main.yml |  3 +--
 roles/base/handlers/main.yml |  5 +++++
 roles/base/tasks/main.yml    |  1 +
 roles/base/tasks/ntp.yml     | 29 +++++++++++++++++++++++++++++
 vars/main.yml                |  3 +--
 7 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 roles/base/tasks/ntp.yml

diff --git a/CHANGELOG b/CHANGELOG
index 8f62600..13def7b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.9.1] - 2021-07-19
+
+### Added
+
+- Configure the ntpd.conf file
+
 ## [6.9.0] - 2021-05-06
 
 ### Changed
diff --git a/README.md b/README.md
index 1037e11..fdd59e8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# EvoBSD 6.9.0
+# EvoBSD 6.9.1
 
 EvoBSD is an ansible project used for customising OpenBSD hosts
 used by Evolix.
diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml
index fa6f093..5431249 100644
--- a/roles/base/defaults/main.yml
+++ b/roles/base/defaults/main.yml
@@ -1,6 +1,5 @@
 ---
-ntpd_servers:
-  - "ntp.evolix.net"
+ntpd_servers: "ntp.evolix.net"
 
 general_alert_email: "root@localhost"
 general_technical_realm: "example.com"
diff --git a/roles/base/handlers/main.yml b/roles/base/handlers/main.yml
index 13c34bc..6ee3975 100644
--- a/roles/base/handlers/main.yml
+++ b/roles/base/handlers/main.yml
@@ -31,3 +31,8 @@
   command: mount -u -o noatime /home
   args:
     warn: false
+
+- name: reload ntp
+  service:
+    name: ntpd
+    state: restarted
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index bd467b3..a7bb5f8 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -10,3 +10,4 @@
 - include: newsyslog.yml
 - include: cron.yml
 - include: fstab.yml
+- include: ntp.yml
diff --git a/roles/base/tasks/ntp.yml b/roles/base/tasks/ntp.yml
new file mode 100644
index 0000000..7e1191f
--- /dev/null
+++ b/roles/base/tasks/ntp.yml
@@ -0,0 +1,29 @@
+---
+- name: Retrieve ntpd.conf content
+  command: cat ntpd.conf
+  args: 
+    chdir: /etc/
+  register: ntpd_conf
+  tags:
+    - ntp
+
+- name: Empty ntpd.conf before customizing it
+  file:
+    path: /etc/ntpd.conf
+    state: absent
+  when: ntpd_conf.stdout is not regex("^server ntp.evolix.net$")
+  tags:
+    - ntp
+
+- name: Customize ntpd conf
+  lineinfile:
+    path: /etc/ntpd.conf
+    line: "server {{ ntpd_servers }}"
+    create: yes
+    owner: root
+    group: wheel
+    mode: '0644'
+  notify:
+    - reload ntp
+  tags:
+    - ntp
diff --git a/vars/main.yml b/vars/main.yml
index 38f109c..053f791 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -3,8 +3,7 @@
 ## Edit and uncomment to overwrite the default values ##
 ########################################################
 
-# ntpd_servers:
-# - "ntp.evolix.net"
+# ntpd_servers: "pool.ntp.org"
 #
 # general_alert_email: "root@localhost"
 # general_technical_realm: "example.com"