From c692105b5c773fe034e8604d1cd6c5f93f0360e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dubois?= <jdubois@evolix.fr>
Date: Wed, 28 Sep 2022 17:50:11 +0200
Subject: [PATCH] base: use "servers" option instead of "server" option for
 ntpd.conf

---
 CHANGELOG                | 1 +
 roles/base/tasks/ntp.yml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5acdad2..7d0557f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * base: export evomaintenance and evobackup tasks into their own roles
 * nagios-nrpe: multiples IP can now be checked with check_ipsecctl_critiques.sh
 * base: use a variable for /etc/installurl content
+* base: use "servers" option instead of "server" option for ntpd.conf
 
 ### Fixed
 
diff --git a/roles/base/tasks/ntp.yml b/roles/base/tasks/ntp.yml
index a0f80ff..badb684 100644
--- a/roles/base/tasks/ntp.yml
+++ b/roles/base/tasks/ntp.yml
@@ -13,14 +13,14 @@
   file:
     path: /etc/ntpd.conf
     state: absent
-  when: ntpd_conf.stdout is not regex('^server ' + ntpd_servers + '$')
+  when: ntpd_conf.stdout is not regex('^servers ' + ntpd_servers + '$')
   tags:
     - ntp
 
 - name: "Customize ntpd conf"
   lineinfile:
     path: /etc/ntpd.conf
-    line: "server {{ ntpd_servers }}"
+    line: "servers {{ ntpd_servers }}"
     create: true
     owner: root
     group: wheel