From 37a85f625f5d6f4734131b40e0fa2c31744a3eeb Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Tue, 16 Jun 2020 09:14:33 -0500
Subject: [PATCH] Move zerotier into its own role

---
 desktop.yml                                              | 9 +++++++++
 .../tasks/zerotier.yml => zerotier/tasks/main.yml}       | 7 +++++++
 2 files changed, 16 insertions(+)
 rename roles/{desktop/tasks/zerotier.yml => zerotier/tasks/main.yml} (80%)

diff --git a/desktop.yml b/desktop.yml
index 7f98e1e..d6c97e2 100644
--- a/desktop.yml
+++ b/desktop.yml
@@ -52,6 +52,15 @@
                 64303363653631653433343361616635373966326433663466636164613062343561333036613937
                 35616666633737356331653632323639373330396433366639326466373639313630
       tags: [ user ]
+    - role: zerotier
+      vars:
+        zerotier_network_id: !vault |
+                $ANSIBLE_VAULT;1.1;AES256
+                35646131343239623265663562343333383362366633386462646465643163353866643633636135
+                6238643231313536323337343663313865323430323437630a353462393830376431376363373232
+                30656433343263653035333637336165323931363966376264353164326135336131646362623734
+                3339633961393864330a616437613534643231366634643362383438316233376334636264303361
+                65313231393433396538663463383731303661633663343066333264303330313133
     - role: ansiblehost
       vars:
         pullplaybook: "desktop.yml"
diff --git a/roles/desktop/tasks/zerotier.yml b/roles/zerotier/tasks/main.yml
similarity index 80%
rename from roles/desktop/tasks/zerotier.yml
rename to roles/zerotier/tasks/main.yml
index 7cd4321..b204224 100644
--- a/roles/desktop/tasks/zerotier.yml
+++ b/roles/zerotier/tasks/main.yml
@@ -20,4 +20,11 @@
     apt:
       name:
         - zerotier-one
+  - name: Join network
+    command:
+      argv:
+        - "zerotier-cli"
+        - "join"
+        - "{{ zerotier_network_id }}"
+    changed_when: no
   become: yes