From 2fc34bbd5a17e002b323017de5d14a69c5940421 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sun, 4 Jul 2021 09:26:17 +0100 Subject: [PATCH] Revert "Merge pull request #796 from Chaz6/update-systemd-files" This reverts commit 88bd098f91fdf7ca693018ab7982f680b5c9db92, reversing changes made to 4d798a34940af2eacba73f274ea9260fb57e8452. --- contrib/systemd/yggdrasil-default-config.service | 4 ++-- contrib/systemd/yggdrasil.service | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/systemd/yggdrasil-default-config.service b/contrib/systemd/yggdrasil-default-config.service index b5af52f8..e9fe45be 100644 --- a/contrib/systemd/yggdrasil-default-config.service +++ b/contrib/systemd/yggdrasil-default-config.service @@ -9,5 +9,5 @@ After=local-fs.target Type=oneshot Group=yggdrasil StandardOutput=file:/etc/yggdrasil.conf -ExecStart=/usr/local/bin/yggdrasil -genconf -ExecStartPost=/usr/local/bin/chmod 0640 /etc/yggdrasil.conf +ExecStart=/usr/bin/yggdrasil -genconf +ExecStartPost=/usr/bin/chmod 0640 /etc/yggdrasil.conf diff --git a/contrib/systemd/yggdrasil.service b/contrib/systemd/yggdrasil.service index 44afaf2b..3002e61b 100644 --- a/contrib/systemd/yggdrasil.service +++ b/contrib/systemd/yggdrasil.service @@ -12,7 +12,7 @@ ProtectSystem=true SyslogIdentifier=yggdrasil CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW ExecStartPre=+-/sbin/modprobe tun -ExecStart=/usr/local/bin/yggdrasil -useconffile /etc/yggdrasil.conf +ExecStart=/usr/bin/yggdrasil -useconffile /etc/yggdrasil.conf ExecReload=/bin/kill -HUP $MAINPID Restart=always TimeoutStopSec=5