From 4eb891b8b7f60fb7aa9db955fe0bee34bb9bd11c Mon Sep 17 00:00:00 2001
From: Gregory Colpart <gcolpart+git@evolix.fr>
Date: Thu, 31 Aug 2017 03:31:00 +0200
Subject: [PATCH] use role ntpd in evolinux-base

---
 evolinux-base/README.md          |  1 -
 evolinux-base/defaults/main.yml  |  4 ----
 evolinux-base/handlers/main.yml  |  4 ----
 evolinux-base/tasks/packages.yml |  1 -
 evolinux-base/tasks/system.yml   | 19 ++-----------------
 5 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/evolinux-base/README.md b/evolinux-base/README.md
index abd70e7d..8ef7a70e 100644
--- a/evolinux-base/README.md
+++ b/evolinux-base/README.md
@@ -33,7 +33,6 @@ Main variables are:
 * `evolinux_apt_hooks`: install APT hooks (default: `True`)
 * `evolinux_apt_remove_aptitude`: uninstall aptitude (default: `True`)
 * `evolinux_delete_nfs`: delete NFS tools (default: `True`)
-* `evolinux_ntp_server`: custom NTP server host or IP (default: `Null`)
 * `evolinux_additional_packages`: optional additional packages to install (default: `[]`)
 * `evolinux_postfix_purge_exim`: purge Exim packages (default: `True`) ;
 * `evolinux_ssh_password_auth_addresses`: list of addresses that can authenticate with a password (default: `[]`)
diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index f4ef9b2e..822bbf9e 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -96,10 +96,6 @@ evolinux_system_alert5_init: True
 evolinux_system_alert5_enable: True
 evolinux_system_eni_auto: True
 
-evolinux_system_ntprestrict: True
-evolinux_system_set_ntpserver: True
-evolinux_system_ntpserver: "ntp.evolix.net"
-
 # root
 
 evolinux_root_include: True
diff --git a/evolinux-base/handlers/main.yml b/evolinux-base/handlers/main.yml
index 002cd978..80b7378e 100644
--- a/evolinux-base/handlers/main.yml
+++ b/evolinux-base/handlers/main.yml
@@ -72,7 +72,3 @@
     name: postfix
     state: reloaded
 
-- name: restart ntp
-  service:
-    name: ntp
-    state: restarted
diff --git a/evolinux-base/tasks/packages.yml b/evolinux-base/tasks/packages.yml
index 8089e397..bb1f81c9 100644
--- a/evolinux-base/tasks/packages.yml
+++ b/evolinux-base/tasks/packages.yml
@@ -6,7 +6,6 @@
   with_items:
   - locales
   - sudo
-  - ntp
   - ntpdate
   - lsb-release
   - dnsutils
diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml
index 67638b55..261ef1a9 100644
--- a/evolinux-base/tasks/system.yml
+++ b/evolinux-base/tasks/system.yml
@@ -111,23 +111,8 @@
   - { regexp: '^52\s*6(\s*1(\s*\*){2})', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1' }
   when: evolinux_system_cron_random
 
-# NTP listen retriction
-- name: Listen only on lo interface
-
-# NTP server address
-  lineinfile:
-    dest: /etc/ntp.conf
-    line: "interface ignore wildcard"
-  notify: restart ntp
-  when: evolinux_system_ntprestrict
-
-- name: Configure NTP
-  replace:
-    dest: /etc/ntp.conf
-    regexp: "^server .*$"
-    replace: "server {{ evolinux_system_ntpserver }}"
-  notify: restart ntp
-  when: evolinux_system_set_ntpserver
+- include_role:
+    name: ntpd
 
 ## alert5