From cdb7cca5d065339bdaded43feed7e628cc8b111e Mon Sep 17 00:00:00 2001
From: funnypro <funnypro@qq.com>
Date: Tue, 11 Jun 2019 10:09:22 +0800
Subject: [PATCH] minor edits

---
 conf/systemd/frpc@.service                                 | 4 ++--
 conf/systemd/frps@.service                                 | 4 ++--
 conf/systemd/{frpc_run-as_root.service => sfrpc.service}   | 1 +
 conf/systemd/{frpc_run-as_root@.service => sfrpc@.service} | 5 +++--
 conf/systemd/{frps_run-as_root.service => sfrps.service}   | 1 +
 conf/systemd/{frps_run-as_root@.service => sfrps@.service} | 5 +++--
 6 files changed, 12 insertions(+), 8 deletions(-)
 rename conf/systemd/{frpc_run-as_root.service => sfrpc.service} (92%)
 rename conf/systemd/{frpc_run-as_root@.service => sfrpc@.service} (81%)
 rename conf/systemd/{frps_run-as_root.service => sfrps.service} (91%)
 rename conf/systemd/{frps_run-as_root@.service => sfrps@.service} (78%)

diff --git a/conf/systemd/frpc@.service b/conf/systemd/frpc@.service
index 94f1bf8f..19a4f94e 100644
--- a/conf/systemd/frpc@.service
+++ b/conf/systemd/frpc@.service
@@ -13,6 +13,6 @@ ExecStart=/usr/bin/frpc -c /etc/frp/%i.ini
 ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini
 
 [Install]
-Alias=frp%i.service
-Alias=frp-client%i.service
+Alias=frp@.service
+Alias=frp-client@.service
 WantedBy=multi-user.target
diff --git a/conf/systemd/frps@.service b/conf/systemd/frps@.service
index a615ed57..890e67ea 100644
--- a/conf/systemd/frps@.service
+++ b/conf/systemd/frps@.service
@@ -12,6 +12,6 @@ RestartSec=3s
 ExecStart=/usr/bin/frps -c /etc/frp/%i.ini
 
 [Install]
-Alias=frpd%i.service
-Alias=frp-server%i.service
+Alias=frpd@.service
+Alias=frp-server@.service
 WantedBy=multi-user.target
diff --git a/conf/systemd/frpc_run-as_root.service b/conf/systemd/sfrpc.service
similarity index 92%
rename from conf/systemd/frpc_run-as_root.service
rename to conf/systemd/sfrpc.service
index 82d0a23a..d3950d42 100644
--- a/conf/systemd/frpc_run-as_root.service
+++ b/conf/systemd/sfrpc.service
@@ -15,4 +15,5 @@ ExecReload=/usr/bin/frpc reload -c /etc/frp/sfrpc.ini
 [Install]
 Alias=sfrp.service
 Alias=sfrp-client.service
+Alias=frpc_run-as_root.service
 WantedBy=multi-user.target
diff --git a/conf/systemd/frpc_run-as_root@.service b/conf/systemd/sfrpc@.service
similarity index 81%
rename from conf/systemd/frpc_run-as_root@.service
rename to conf/systemd/sfrpc@.service
index b478c687..7ed5766d 100644
--- a/conf/systemd/frpc_run-as_root@.service
+++ b/conf/systemd/sfrpc@.service
@@ -13,6 +13,7 @@ ExecStart=/usr/bin/frpc -c /etc/frp/%i.ini
 ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini
 
 [Install]
-Alias=sfrp%i.service
-Alias=sfrp-client%i.service
+Alias=sfrp@.service
+Alias=sfrp-client@.service
+Alias=frpc_run-as_root@.service
 WantedBy=multi-user.target
diff --git a/conf/systemd/frps_run-as_root.service b/conf/systemd/sfrps.service
similarity index 91%
rename from conf/systemd/frps_run-as_root.service
rename to conf/systemd/sfrps.service
index ee756a34..5c6b4f88 100644
--- a/conf/systemd/frps_run-as_root.service
+++ b/conf/systemd/sfrps.service
@@ -14,4 +14,5 @@ ExecStart=/usr/bin/frps -c /etc/frp/sfrps.ini
 [Install]
 Alias=sfrpd.service
 Alias=sfrp-server.service
+Alias=frps_run-as_root.service
 WantedBy=multi-user.target
diff --git a/conf/systemd/frps_run-as_root@.service b/conf/systemd/sfrps@.service
similarity index 78%
rename from conf/systemd/frps_run-as_root@.service
rename to conf/systemd/sfrps@.service
index 40801ce9..b76956c4 100644
--- a/conf/systemd/frps_run-as_root@.service
+++ b/conf/systemd/sfrps@.service
@@ -12,6 +12,7 @@ RestartSec=3s
 ExecStart=/usr/bin/frps -c /etc/frp/%i.ini
 
 [Install]
-Alias=sfrpd%i.service
-Alias=sfrp-server%i.service
+Alias=sfrpd@.service
+Alias=sfrp-server@.service
+Alias=frps_run-as_root@.service
 WantedBy=multi-user.target