From bf6245174b5b0ffc4c4b4dad898c0e60e01235cc Mon Sep 17 00:00:00 2001
From: Eamonn Travers <eamonn@travers-berlin.de>
Date: Tue, 16 Jun 2020 15:56:07 +0200
Subject: [PATCH] Add ntp role

---
 group_vars/apt.yml                            |  5 ----
 ntp.yml                                       | 29 ++-----------------
 roles/ntp/defaults/main.yml                   |  4 +++
 roles/ntp/tasks/main.yml                      | 25 ++++++++++++++++
 .../ntp/templates/etc/chrony.conf.j2          |  0
 .../ntp/templates/etc/ntp.conf.j2             |  0
 6 files changed, 31 insertions(+), 32 deletions(-)
 create mode 100644 roles/ntp/defaults/main.yml
 create mode 100644 roles/ntp/tasks/main.yml
 rename chrony.conf.j2 => roles/ntp/templates/etc/chrony.conf.j2 (100%)
 rename ntp.conf.j2 => roles/ntp/templates/etc/ntp.conf.j2 (100%)

diff --git a/group_vars/apt.yml b/group_vars/apt.yml
index 369a4eb..3d3c8ba 100644
--- a/group_vars/apt.yml
+++ b/group_vars/apt.yml
@@ -1,7 +1,2 @@
-ntp_servers:
-  - 0.debian.pool.ntp.org
-  - 1.debian.pool.ntp.org
-  - 2.debian.pool.ntp.org
-
 ntp_package_name : ntp
 ntp_service_name : ntp
diff --git a/ntp.yml b/ntp.yml
index 1d9f4d3..35fe396 100644
--- a/ntp.yml
+++ b/ntp.yml
@@ -1,29 +1,4 @@
 ---
 - hosts: sysd
-
-  tasks:
-
-    - name: Install NTP
-      package:
-        name: "{{ ntp_package_name }}"
-        state: latest
-
-    - name: Template Config
-      template:
-        src: "{{ ntp_package_name }}.conf.j2"
-        dest: "/etc/{{ ntp_package_name  }}.conf"
-        mode: 0644
-        owner: root
-        group: root
-        backup: yes
-
-    - name: Restart Service
-      service:
-        name: "{{ ntp_service_name }}"
-        state: restarted
-
-    - name: Ensure Running
-      service:
-        name: "{{ ntp_service_name }}"
-        state: started
-        enabled: yes
+  roles:
+    - ntp
diff --git a/roles/ntp/defaults/main.yml b/roles/ntp/defaults/main.yml
new file mode 100644
index 0000000..5f9b4df
--- /dev/null
+++ b/roles/ntp/defaults/main.yml
@@ -0,0 +1,4 @@
+ntp_servers:
+  - 0.debian.pool.ntp.org
+  - 1.debian.pool.ntp.org
+  - 2.debian.pool.ntp.org
diff --git a/roles/ntp/tasks/main.yml b/roles/ntp/tasks/main.yml
new file mode 100644
index 0000000..9b4496b
--- /dev/null
+++ b/roles/ntp/tasks/main.yml
@@ -0,0 +1,25 @@
+---
+- name: Install NTP
+  package:
+    name: "{{ ntp_package_name }}"
+    state: latest
+
+- name: Template Config
+  template:
+    src: "etc/{{ ntp_package_name }}.conf.j2"
+    dest: "/etc/{{ ntp_package_name  }}.conf"
+    mode: 0644
+    owner: root
+    group: root
+    backup: yes
+
+- name: Restart Service
+  service:
+    name: "{{ ntp_service_name }}"
+    state: restarted
+
+- name: Ensure Running
+  service:
+    name: "{{ ntp_service_name }}"
+    state: started
+    enabled: yes
diff --git a/chrony.conf.j2 b/roles/ntp/templates/etc/chrony.conf.j2
similarity index 100%
rename from chrony.conf.j2
rename to roles/ntp/templates/etc/chrony.conf.j2
diff --git a/ntp.conf.j2 b/roles/ntp/templates/etc/ntp.conf.j2
similarity index 100%
rename from ntp.conf.j2
rename to roles/ntp/templates/etc/ntp.conf.j2