From cddaf793e8433aa51733786f64f6b5d668315198 Mon Sep 17 00:00:00 2001
From: Marcus Meurs <marcusmeurs@gmail.com>
Date: Thu, 27 Jul 2017 00:23:20 +0200
Subject: [PATCH 1/3] Add installation tasks

Add Zerotier repo and it's pgp key. Install zerotier-one.
---
 tasks/install.yml | 43 +++++++++++++++++++++++++++++++++++++++++++
 tasks/main.yml    |  3 ++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 tasks/install.yml

diff --git a/tasks/install.yml b/tasks/install.yml
new file mode 100644
index 0000000..3d575b0
--- /dev/null
+++ b/tasks/install.yml
@@ -0,0 +1,43 @@
+---
+- block: # Add zerotier repo and it's gpg key
+  - name: Add zerotier gpg key
+    rpm_key:
+      state: present
+      key: https://download.zerotier.com/contact%40zerotier.com.gpg
+
+  - name: Add zerotier repo
+    yum_repository:
+      name: zerotier
+      description: ZeroTier, Inc. RPM Release Repository
+      baseurl: https://download.zerotier.com/redhat/el/$releasever
+      gpgcheck: yes
+      enabled: yes
+    register: zerotier_repo
+
+  tags:
+  - installation
+  - repositories
+
+- block: #Install and enable zerotier-one
+  - name: Install zerotier-one
+    package:
+      name: zerotier-one
+      state: present
+    register: zerotier_client
+    notify:
+    - start zerotier-one
+    - enable zerotier-one
+
+#  - name: Start and enable zerotier-one service
+#    service:
+#      name: zerotier-one
+#      state: restarted
+#      enabled: yes
+#    when:
+#    - zerotier_client|changed
+
+  when:
+  - zerotier_repo|succeeded
+  tags:
+  - installation
+  - packages
diff --git a/tasks/main.yml b/tasks/main.yml
index be3b8ff..1319dcd 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,2 +1,3 @@
 ---
-# tasks file for ansible-role-zerotier
\ No newline at end of file
+# tasks file for ansible-role-zerotier
+- include: install.yml

From 51070141ae8ecab75a64105635a16413b4630781 Mon Sep 17 00:00:00 2001
From: Marcus Meurs <marcusmeurs@gmail.com>
Date: Thu, 27 Jul 2017 00:24:07 +0200
Subject: [PATCH 2/3] Add handlers

Handlers to control the zerotier-one service
---
 handlers/main.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index d2159bb..547ddb9 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,13 @@
 ---
-# handlers file for ansible-role-zerotier
\ No newline at end of file
+# handlers file for ansible-role-zerotier
+- name: start zerotier-one
+  service: name=zerotier-one status=started
+
+- name: stop zerotier-one
+  service: name=zerotier-one status=stopped
+
+- name: restart zerotier-one
+  service: name=zerotier-one status=restarted
+
+- name: enable zerotier-one
+  service: name=zerotier-one enabled=yes

From 8e5fd5d83c0ae6e525caa32acbf902bbb2e4f4be Mon Sep 17 00:00:00 2001
From: Marcus Meurs <marcusmeurs@gmail.com>
Date: Thu, 27 Jul 2017 00:34:10 +0200
Subject: [PATCH 3/3] Better service state handling

---
 tasks/install.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/tasks/install.yml b/tasks/install.yml
index 3d575b0..34e95fc 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -24,17 +24,15 @@
       name: zerotier-one
       state: present
     register: zerotier_client
-    notify:
-    - start zerotier-one
-    - enable zerotier-one
 
-#  - name: Start and enable zerotier-one service
-#    service:
-#      name: zerotier-one
-#      state: restarted
-#      enabled: yes
-#    when:
-#    - zerotier_client|changed
+  - name: Start zerotier-one service
+    service:
+      name: zerotier-one
+      state: started
+    when:
+    - zerotier_client|succeeded
+    notify:
+    - enable zerotier-one
 
   when:
   - zerotier_repo|succeeded