From 6459c45b5c5ff3fbfcc89e3d93899b4495e5a9f8 Mon Sep 17 00:00:00 2001 From: iBug Date: Sun, 17 Nov 2019 14:18:23 +0800 Subject: [PATCH] Update systemd unit files - Add instance name to template units - Change service type to `idle` for frpc - Check config file existence before starting --- conf/systemd/frpc.service | 3 ++- conf/systemd/frpc@.service | 4 +++- conf/systemd/frps.service | 2 ++ conf/systemd/frps@.service | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/conf/systemd/frpc.service b/conf/systemd/frpc.service index dd88ce01..9d79dc2f 100644 --- a/conf/systemd/frpc.service +++ b/conf/systemd/frpc.service @@ -1,9 +1,10 @@ [Unit] Description=Frp Client Service After=network.target +StartLimitIntervalSec=3 [Service] -Type=simple +Type=idle User=nobody Restart=on-failure RestartSec=5s diff --git a/conf/systemd/frpc@.service b/conf/systemd/frpc@.service index 46251ed8..7adbfb01 100644 --- a/conf/systemd/frpc@.service +++ b/conf/systemd/frpc@.service @@ -1,12 +1,14 @@ [Unit] -Description=Frp Client Service +Description=Frp Client Service (%i) After=network.target +StartLimitIntervalSec=3 [Service] Type=idle User=nobody Restart=on-failure RestartSec=5s +ExecStartPre=/bin/test -s /etc/frp/%i.ini ExecStart=/usr/bin/frpc -c /etc/frp/%i.ini ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini diff --git a/conf/systemd/frps.service b/conf/systemd/frps.service index 1daa2674..07116358 100644 --- a/conf/systemd/frps.service +++ b/conf/systemd/frps.service @@ -1,12 +1,14 @@ [Unit] Description=Frp Server Service After=network.target +StartLimitIntervalSec=3 [Service] Type=simple User=nobody Restart=on-failure RestartSec=5s +ExecStartPre=/bin/test -s /etc/frp/frps.ini ExecStart=/usr/bin/frps -c /etc/frp/frps.ini [Install] diff --git a/conf/systemd/frps@.service b/conf/systemd/frps@.service index 8b625ca7..eae2a88e 100644 --- a/conf/systemd/frps@.service +++ b/conf/systemd/frps@.service @@ -1,12 +1,14 @@ [Unit] -Description=Frp Server Service +Description=Frp Server Service (%i) After=network.target +StartLimitIntervalSec=3 [Service] Type=simple User=nobody Restart=on-failure RestartSec=5s +ExecStartPre=/bin/test -s /etc/frp/%i.ini ExecStart=/usr/bin/frps -c /etc/frp/%i.ini [Install]