Merge pull request #21 from realraum/ntp

Deploy openntpd

diff --git a/ansible/roles/base/defaults/main.yml b/ansible/roles/base/defaults/main.yml
new file mode 100644 (file)
index 0000000..ea08535
--- /dev/null
+++ b/ansible/roles/base/defaults/main.yml
@@ -0,0 +1 @@
+base_managed_ntpd: yes

diff --git a/ansible/roles/base/handlers/main.yml b/ansible/roles/base/handlers/main.yml
index 822887e..a86fcde 100644 (file)
--- a/ansible/roles/base/handlers/main.yml
+++ b/ansible/roles/base/handlers/main.yml
@@ -3,3 +3,8 @@
   service:
     name: ssh
     state: restarted
+
+- name: restart openntpd
+  service:
+    name: openntpd
+    state: restarted

diff --git a/ansible/roles/base/tasks/main.yml b/ansible/roles/base/tasks/main.yml
index 919b2aa..947987e 100644 (file)
--- a/ansible/roles/base/tasks/main.yml
+++ b/ansible/roles/base/tasks/main.yml
@@ -70,7 +70,6 @@
       - lsof
       - haveged
       - net-tools
-      - ntp
       - screen
       - aptitude
       - unp
@@ -81,6 +80,32 @@
       - python-apt
     state: present
 
+- when: base_managed_ntpd
+  block:
+    - name: check that ISC ntpd is not installed
+      apt:
+        name: ntp
+        state: absent
+        purge: yes
+
+    - name: install openntpd
+      apt:
+        name: openntpd
+
+    - name: configure openntpd
+      copy:
+        dest: /etc/openntpd/ntpd.conf
+        content: |
+          # Use the ffgraz.net NTP server
+          servers ntp.ffgraz.net weight 3
+
+          # Use some servers announced from the NTP Pool
+          servers 0.debian.pool.ntp.org
+          servers 1.debian.pool.ntp.org
+
+      notify: restart openntpd
+
+
 - name: make sure grml-(etc|scripts)-core is not installed
   apt:
     name: