From 39078538c5739a5c4af6ad33ffcde1e909421b15 Mon Sep 17 00:00:00 2001 From: Salt Date: Wed, 30 Sep 2020 16:50:15 -0500 Subject: [PATCH] Wrench Zerotier timeouts down and hopefully solve the timeout issue in general Was having issues with it stalling shutdowns. Hopefully it was just a unit misconfig, but I've no remorse in just killing some network daemon on shutdown --- roles/desktop-zerotier/handlers/main.yml | 9 +++++++++ roles/desktop-zerotier/tasks/main.yml | 5 +++++ .../templates/zerotier-one.service | 14 ++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 roles/desktop-zerotier/handlers/main.yml create mode 100644 roles/desktop-zerotier/templates/zerotier-one.service diff --git a/roles/desktop-zerotier/handlers/main.yml b/roles/desktop-zerotier/handlers/main.yml new file mode 100644 index 0000000..4b015ef --- /dev/null +++ b/roles/desktop-zerotier/handlers/main.yml @@ -0,0 +1,9 @@ +#!/usr/bin/ansible-playbook +# vim:ft=ansible: +--- +- name: restart zerotier + systemd: + daemon_reload: yes + name: zerotier-one.service + state: restarted + become: yes diff --git a/roles/desktop-zerotier/tasks/main.yml b/roles/desktop-zerotier/tasks/main.yml index b204224..ab88cfd 100644 --- a/roles/desktop-zerotier/tasks/main.yml +++ b/roles/desktop-zerotier/tasks/main.yml @@ -20,6 +20,11 @@ apt: name: - zerotier-one + - name: Template out unit + template: + src: zerotier-one.service + dest: /etc/systemd/system/zerotier-one.service + notify: restart zerotier - name: Join network command: argv: diff --git a/roles/desktop-zerotier/templates/zerotier-one.service b/roles/desktop-zerotier/templates/zerotier-one.service new file mode 100644 index 0000000..be6154d --- /dev/null +++ b/roles/desktop-zerotier/templates/zerotier-one.service @@ -0,0 +1,14 @@ +[Unit] +Description=ZeroTier One +After=network.target +Wants=network-online.target + +[Service] +ExecStart=/usr/sbin/zerotier-one +Restart=always +KillMode=process +# Issue 738 +TimeoutStopSec=10 + +[Install] +WantedBy=multi-user.target