From 7ecfc6a95edc2a9e0f4b8cd53aa3638e8634b5ee Mon Sep 17 00:00:00 2001
From: linus <linus@fsfe.org>
Date: Thu, 2 Dec 2021 17:46:40 +0100
Subject: [PATCH] various fixes to task files

---
 roles/client/tasks/main.yml | 32 ++++++++++++++++++++------------
 roles/server/tasks/main.yml | 20 +++++++++++++-------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/roles/client/tasks/main.yml b/roles/client/tasks/main.yml
index da54543..a241e20 100644
--- a/roles/client/tasks/main.yml
+++ b/roles/client/tasks/main.yml
@@ -10,30 +10,38 @@
       - wireguard
       - wireguard-tools
 
-- name: Copy binary to server (innernet)
+- name: Copy package to server
   synchronize:
-    src: "server"
-    dest: "/usr/bin/innernet"
+    src: "innernet.deb"
+    dest: "/tmp/innernet.deb"
 
-- name: Create alias ("inn")
-  lineinfile:
-    path: "/root/.bashrc"
-    line: '"alias inn="innernet"'
+- name: Install package
+  apt:
+    deb: "/tmp/innernet.deb"
+    install_recommends: true
 
 - name: Copy non-admin invitation to servers
   synchronize:
     src: "{{ item.name }}.toml"
-    dest: "/home/root/{{ item.name }}.toml"
-    loop: "{{ peers }}"
+    dest: "/tmp/{{ item.name }}.toml"
   when:
     - item.cidr == "machines"
     - item.name in "{{ ansible_host }}"
+  with_items: "{{ peers }}"
 
 - name: Install non-admin invitation on servers
   shell: |
-    innernet install {{ item.name }}.toml \
-    --yes
-  loop: "{{ peers }}"
+    innernet install /tmp/{{ item.name }}.toml \
+      --default-name \
+      --delete-invite
   when:
     - item.cidr == "machines"
     - item.name in "{{ ansible_host }}"
+  with_items: "{{ peers }}"
+  ignore_errors: true
+
+- name: Enable innernet daemon
+  systemd:
+    name: "innernet@{{ network_name }}"
+    state: restarted
+    daemon_reload: true
diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml
index 8b8675a..ac42a7a 100644
--- a/roles/server/tasks/main.yml
+++ b/roles/server/tasks/main.yml
@@ -10,15 +10,15 @@
       - wireguard
       - wireguard-tools
 
-- name: Copy binary to server
+- name: Copy package to server
   synchronize:
-    src: "innernet-server"
-    dest: "/usr/bin/"
+    src: "innernet-server.deb"
+    dest: "/tmp/innernet-server.deb"
 
-- name: Create alias ("inns")
-  lineinfile:
-    path: "/root/.bashrc"
-    line: '"alias inns="innernet-server"'
+- name: Install package
+  apt:
+    deb: "/tmp/innernet-server.deb"
+    install_recommends: true
 
 - name: Create base network
   shell: |
@@ -83,3 +83,9 @@
     dest: "{{ playbook_dir }}/roles/client/files/{{ item.name }}.toml"
     mode: pull
   with_items: "{{ peers }}"
+
+- name: Enable innernet-server daemon
+  systemd:
+    name: "innernet-server@{{ network_name }}"
+    state: restarted
+    daemon_reload: true