From 53bf738aae0b73c1743412d8d573c5d0331de8ed Mon Sep 17 00:00:00 2001 From: Peter Geis Date: Wed, 3 Jan 2018 11:00:08 -0500 Subject: [PATCH 1/3] Fix systemd scripts. Makefile installation directory is /usr. Adjusted systemd scripts to correct directory from /opt to /usr. Allows systemd scripts to work correctly. --- systemd/softether-vpnbridge.service | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/systemd/softether-vpnbridge.service b/systemd/softether-vpnbridge.service index 2f508820..4221b345 100644 --- a/systemd/softether-vpnbridge.service +++ b/systemd/softether-vpnbridge.service @@ -1,12 +1,12 @@ [Unit] Description=SoftEther VPN Bridge After=network.target auditd.service -ConditionPathExists=!/opt/vpnbridge/do_not_run +ConditionPathExists=!/usr/vpnbridge/do_not_run [Service] Type=forking -ExecStart=/opt/vpnbridge/vpnbridge start -ExecStop=/opt/vpnbridge/vpnbridge stop +ExecStart=/usr/vpnbridge/vpnbridge start +ExecStop=/usr/vpnbridge/vpnbridge stop KillMode=process Restart=on-failure @@ -15,7 +15,7 @@ PrivateTmp=yes ProtectHome=yes ProtectSystem=full ReadOnlyDirectories=/ -ReadWriteDirectories=-/opt/vpnbridge +ReadWriteDirectories=-/usr/vpnbridge CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_ADMIN CAP_SETUID [Install] From 21b778551f305704307e0423968a53b240988fb5 Mon Sep 17 00:00:00 2001 From: Peter Geis Date: Wed, 3 Jan 2018 11:04:11 -0500 Subject: [PATCH 2/3] Fix systemd scripts. Makefile installation directory is /usr. Adjusted systemd scripts to correct directory from /opt to /usr. Allows systemd scripts to work correctly. --- systemd/softether-vpnclient.service | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/systemd/softether-vpnclient.service b/systemd/softether-vpnclient.service index 1e9dbd0e..8d435af3 100644 --- a/systemd/softether-vpnclient.service +++ b/systemd/softether-vpnclient.service @@ -1,13 +1,13 @@ [Unit] Description=SoftEther VPN Client After=network.target auditd.service -ConditionPathExists=!/opt/vpnclient/do_not_run +ConditionPathExists=!/usr/vpnclient/do_not_run [Service] Type=forking -EnvironmentFile=-/opt/vpnclient -ExecStart=/opt/vpnclient/vpnclient start -ExecStop=/opt/vpnclient/vpnclient stop +EnvironmentFile=-/usr/vpnclient +ExecStart=/usr/vpnclient/vpnclient start +ExecStop=/usr/vpnclient/vpnclient stop KillMode=process Restart=on-failure @@ -16,7 +16,7 @@ PrivateTmp=yes ProtectHome=yes ProtectSystem=full ReadOnlyDirectories=/ -ReadWriteDirectories=-/opt/vpnclient +ReadWriteDirectories=-/usr/vpnclient CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_ADMIN CAP_SETUID [Install] From 9fc6f634c51555f83e4f6ea23a3b7bf509e531aa Mon Sep 17 00:00:00 2001 From: Peter Geis Date: Wed, 3 Jan 2018 11:05:10 -0500 Subject: [PATCH 3/3] Fix systemd scripts. Makefile installation directory is /usr. Adjusted systemd scripts to correct directory from /opt to /usr. Allows systemd scripts to work correctly. --- systemd/softether-vpnserver.service | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/systemd/softether-vpnserver.service b/systemd/softether-vpnserver.service index 951b13db..abf426c8 100644 --- a/systemd/softether-vpnserver.service +++ b/systemd/softether-vpnserver.service @@ -1,13 +1,13 @@ [Unit] Description=SoftEther VPN Server After=network.target auditd.service -ConditionPathExists=!/opt/vpnserver/do_not_run +ConditionPathExists=!/usr/vpnserver/do_not_run [Service] Type=forking -EnvironmentFile=-/opt/vpnserver -ExecStart=/opt/vpnserver/vpnserver start -ExecStop=/opt/vpnserver/vpnserver stop +EnvironmentFile=-/usr/vpnserver +ExecStart=/usr/vpnserver/vpnserver start +ExecStop=/usr/vpnserver/vpnserver stop KillMode=process Restart=on-failure @@ -16,7 +16,7 @@ PrivateTmp=yes ProtectHome=yes ProtectSystem=full ReadOnlyDirectories=/ -ReadWriteDirectories=-/opt/vpnserver +ReadWriteDirectories=-/usr/vpnserver CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_ADMIN CAP_SETUID [Install]