From da079eeaeae392ed580db5704414d10f952b9f39 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 12 Apr 2020 10:58:29 +0200
Subject: T2185: move systemd unit files to proper location

---
 src/etc/systemd/system/accel-ppp-l2tp.service | 14 --------------
 src/etc/systemd/system/accel-ppp-sstp.service | 14 --------------
 src/etc/systemd/system/ppp@.service           | 11 -----------
 src/systemd/accel-ppp-l2tp.service            | 14 ++++++++++++++
 src/systemd/accel-ppp-sstp.service            | 14 ++++++++++++++
 src/systemd/ppp@.service                      | 11 +++++++++++
 src/systemd/tftpd@.service                    |  2 +-
 7 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 src/etc/systemd/system/accel-ppp-l2tp.service
 delete mode 100644 src/etc/systemd/system/accel-ppp-sstp.service
 delete mode 100644 src/etc/systemd/system/ppp@.service
 create mode 100644 src/systemd/accel-ppp-l2tp.service
 create mode 100644 src/systemd/accel-ppp-sstp.service
 create mode 100644 src/systemd/ppp@.service

(limited to 'src')

diff --git a/src/etc/systemd/system/accel-ppp-l2tp.service b/src/etc/systemd/system/accel-ppp-l2tp.service
deleted file mode 100644
index 27f0cc8c0..000000000
--- a/src/etc/systemd/system/accel-ppp-l2tp.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Accel-PPP/L2TP
-After=vyos-router.service
-
-[Service]
-ExecStart=/usr/sbin/accel-pppd -d -p /run/accel-pppd-l2tp.pid -c /etc/accel-ppp/l2tp.conf
-ExecReload=/bin/kill -SIGUSR1 $MAINPID
-PIDFile=/run/accel-pppd-l2tp.pid
-Type=forking
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-Alias=accel-ppp-l2tp.service
diff --git a/src/etc/systemd/system/accel-ppp-sstp.service b/src/etc/systemd/system/accel-ppp-sstp.service
deleted file mode 100644
index 03bd7f99c..000000000
--- a/src/etc/systemd/system/accel-ppp-sstp.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Accel-PPP/SSTP
-After=vyos-router.service
-
-[Service]
-ExecStart=/usr/sbin/accel-pppd -d -p /run/accel-pppd-sstp.pid -c /etc/accel-ppp/sstp.conf
-ExecReload=/bin/kill -SIGUSR1 $MAINPID
-PIDFile=/run/accel-pppd-sstp.pid
-Type=forking
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-Alias=accel-ppp-sstp.service
diff --git a/src/etc/systemd/system/ppp@.service b/src/etc/systemd/system/ppp@.service
deleted file mode 100644
index d271efb41..000000000
--- a/src/etc/systemd/system/ppp@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Dialing PPP connection %I
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/pppd call %I nodetach nolog
-Restart=on-failure
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/src/systemd/accel-ppp-l2tp.service b/src/systemd/accel-ppp-l2tp.service
new file mode 100644
index 000000000..27f0cc8c0
--- /dev/null
+++ b/src/systemd/accel-ppp-l2tp.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Accel-PPP/L2TP
+After=vyos-router.service
+
+[Service]
+ExecStart=/usr/sbin/accel-pppd -d -p /run/accel-pppd-l2tp.pid -c /etc/accel-ppp/l2tp.conf
+ExecReload=/bin/kill -SIGUSR1 $MAINPID
+PIDFile=/run/accel-pppd-l2tp.pid
+Type=forking
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Alias=accel-ppp-l2tp.service
diff --git a/src/systemd/accel-ppp-sstp.service b/src/systemd/accel-ppp-sstp.service
new file mode 100644
index 000000000..03bd7f99c
--- /dev/null
+++ b/src/systemd/accel-ppp-sstp.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Accel-PPP/SSTP
+After=vyos-router.service
+
+[Service]
+ExecStart=/usr/sbin/accel-pppd -d -p /run/accel-pppd-sstp.pid -c /etc/accel-ppp/sstp.conf
+ExecReload=/bin/kill -SIGUSR1 $MAINPID
+PIDFile=/run/accel-pppd-sstp.pid
+Type=forking
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Alias=accel-ppp-sstp.service
diff --git a/src/systemd/ppp@.service b/src/systemd/ppp@.service
new file mode 100644
index 000000000..bb4622034
--- /dev/null
+++ b/src/systemd/ppp@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Dialing PPP connection %I
+After=vyos-router.service
+
+[Service]
+ExecStart=/usr/sbin/pppd call %I nodetach nolog
+Restart=on-failure
+RestartSec=5s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/systemd/tftpd@.service b/src/systemd/tftpd@.service
index e5c289466..266bc0962 100644
--- a/src/systemd/tftpd@.service
+++ b/src/systemd/tftpd@.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=TFTP server
-After=network.target
+After=vyos-router.service
 RequiresMountsFor=/run
 
 [Service]
-- 
cgit v1.2.3