From 1ba9654b5b3726d7cafdf8f65280a542b2674406 Mon Sep 17 00:00:00 2001
From: funnypro <funnypro@qq.com>
Date: Mon, 12 Aug 2019 19:10:02 +0800
Subject: [PATCH] Last systemd and procd configuration submission

---
 conf/procd/frpc             | 20 ++++++++++----------
 conf/procd/frps             | 18 +++++++++---------
 conf/procd/sfrpc            | 28 ----------------------------
 conf/procd/sfrps            | 28 ----------------------------
 conf/systemd/frpc.service   |  6 +++---
 conf/systemd/frpc@.service  |  6 +++---
 conf/systemd/frps.service   |  4 ++--
 conf/systemd/frps@.service  |  4 ++--
 conf/systemd/sfrpc.service  | 19 -------------------
 conf/systemd/sfrpc@.service | 19 -------------------
 conf/systemd/sfrps.service  | 18 ------------------
 conf/systemd/sfrps@.service | 18 ------------------
 12 files changed, 29 insertions(+), 159 deletions(-)
 delete mode 100644 conf/procd/sfrpc
 delete mode 100644 conf/procd/sfrps
 delete mode 100644 conf/systemd/sfrpc.service
 delete mode 100644 conf/systemd/sfrpc@.service
 delete mode 100644 conf/systemd/sfrps.service
 delete mode 100644 conf/systemd/sfrps@.service

diff --git a/conf/procd/frpc b/conf/procd/frpc
index 4d43a8f9..bb699c71 100644
--- a/conf/procd/frpc
+++ b/conf/procd/frpc
@@ -4,25 +4,25 @@
 
 START=50
 STOP=50
-
 USE_PROCD=1
-PROG=/usr/bin/frpc
-CONFFILE=/etc/frp/frpc.ini
+
+NAME=frps
+PROG=/usr/bin/"${NAME}"
+CONFIGFILE=/etc/frp/"${NAME}".ini
 
 start_service(){
-    procd_open_instance
-    procd_set_param command "${PROG}" -c "${CONFFILE}"
-    procd_set_param file "${CONFFILE}"
-    procd_set_param user nobody
+    procd_open_instance "${NAME}"
+    procd_set_param command "${PROG}" -c "${CONFIGFILE}"
+    procd_set_param file "${CONFIGFILE}"
     procd_set_param respawn
+    
+    procd_set_param user nobody #root can use 1~1024 ports
 
-    procd_set_param watch network.interface
-    procd_set_param netdev dev
     procd_set_param stdout 1
     procd_set_param stderr 1
     procd_close_instance
 }
 
 reload_service(){
-    restart
+    "${PROG}" reload -c "${CONFIGFILE}"
 }
diff --git a/conf/procd/frps b/conf/procd/frps
index 0dadaee1..3afc6296 100644
--- a/conf/procd/frps
+++ b/conf/procd/frps
@@ -4,20 +4,20 @@
 
 START=50
 STOP=50
-
 USE_PROCD=1
-PROG=/usr/bin/frps
-CONFFILE=/etc/frp/frps.ini
+
+NAME=frps
+PROG=/usr/bin/"${NAME}"
+CONFIGFILE=/etc/frp/"${NAME}".ini
 
 start_service(){
-    procd_open_instance
-    procd_set_param command "${PROG}" -c "${CONFFILE}"
-    procd_set_param file "${CONFFILE}"
-    procd_set_param user nobody
+    procd_open_instance "${NAME}"
+    procd_set_param command "${PROG}" -c "${CONFIGFILE}"
+    procd_set_param file "${CONFIGFILE}"
     procd_set_param respawn
     
-    procd_set_param watch network.interface
-    procd_set_param netdev dev
+    procd_set_param user nobody #root can use 1~1024 ports
+    
     procd_set_param stdout 1
     procd_set_param stderr 1
     procd_close_instance
diff --git a/conf/procd/sfrpc b/conf/procd/sfrpc
deleted file mode 100644
index 87e33ba7..00000000
--- a/conf/procd/sfrpc
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-
-
-START=50
-STOP=50
-
-USE_PROCD=1
-PROG=/usr/bin/frpc
-CONFFILE=/etc/frp/frpc.ini
-
-start_service(){
-    procd_open_instance
-    procd_set_param command "${PROG}" -c "${CONFFILE}"
-    procd_set_param file "${CONFFILE}"
-    procd_set_param user root
-    procd_set_param respawn
-
-    procd_set_param watch network.interface
-    procd_set_param netdev dev
-    procd_set_param stdout 1
-    procd_set_param stderr 1
-    procd_close_instance
-}
-
-reload_service(){
-    restart
-}
diff --git a/conf/procd/sfrps b/conf/procd/sfrps
deleted file mode 100644
index a7d852e9..00000000
--- a/conf/procd/sfrps
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-
-
-START=50
-STOP=50
-
-USE_PROCD=1
-PROG=/usr/bin/frps
-CONFFILE=/etc/frp/frps.ini
-
-start_service(){
-    procd_open_instance
-    procd_set_param command "${PROG}" -c "${CONFFILE}"
-    procd_set_param file "${CONFFILE}"
-    procd_set_param user root
-    procd_set_param respawn
-    
-    procd_set_param watch network.interface
-    procd_set_param netdev dev
-    procd_set_param stdout 1
-    procd_set_param stderr 1
-    procd_close_instance
-}
-
-reload_service(){
-    restart
-}
diff --git a/conf/systemd/frpc.service b/conf/systemd/frpc.service
index 97c2cdf6..3f185c8e 100644
--- a/conf/systemd/frpc.service
+++ b/conf/systemd/frpc.service
@@ -6,10 +6,10 @@ After=network.target
 
 [Service]
 Type=simple
-User=nobody
+User=nobody #root can use 1~1024 ports
 Restart=on-failure
-ExecStart=/usr/bin/frpc -c /etc/frp/frpc.ini
-ExecReload=/usr/bin/frpc reload -c /etc/frp/frpc.ini
+ExecStart=/usr/bin/frpc -c /etc/frp/client/frpc.ini
+ExecReload=/usr/bin/frpc reload -c /etc/frp/client/frpc.ini
 StandardOutput=syslog
 
 [Install]
diff --git a/conf/systemd/frpc@.service b/conf/systemd/frpc@.service
index 4a9babb6..f61c5199 100644
--- a/conf/systemd/frpc@.service
+++ b/conf/systemd/frpc@.service
@@ -6,10 +6,10 @@ After=network.target
 
 [Service]
 Type=simple
-User=nobody
+User=nobody #root can use 1~1024 ports
 Restart=on-failure
-ExecStart=/usr/bin/frpc -c /etc/frp/%i.ini
-ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini
+ExecStart=/usr/bin/frpc -c /etc/frp/client/%i.ini
+ExecReload=/usr/bin/frpc reload -c /etc/frp/client/%i.ini
 StandardOutput=syslog
 
 [Install]
diff --git a/conf/systemd/frps.service b/conf/systemd/frps.service
index d111f74f..c2f5b739 100644
--- a/conf/systemd/frps.service
+++ b/conf/systemd/frps.service
@@ -6,9 +6,9 @@ After=network.target
 
 [Service]
 Type=simple
-User=nobody
+User=nobody #root can use 1~1024 ports
 Restart=on-failure
-ExecStart=/usr/bin/frps -c /etc/frp/frps.ini
+ExecStart=/usr/bin/frps -c /etc/frp/server/frps.ini
 StandardOutput=syslog
 
 [Install]
diff --git a/conf/systemd/frps@.service b/conf/systemd/frps@.service
index a6a951f9..400f2b6b 100644
--- a/conf/systemd/frps@.service
+++ b/conf/systemd/frps@.service
@@ -6,9 +6,9 @@ After=network.target
 
 [Service]
 Type=simple
-User=nobody
+User=nobody #root can use 1~1024 ports
 Restart=on-failure
-ExecStart=/usr/bin/frps -c /etc/frp/%i.ini
+ExecStart=/usr/bin/frps -c /etc/frp/server/%i.ini
 StandardOutput=syslog
 
 [Install]
diff --git a/conf/systemd/sfrpc.service b/conf/systemd/sfrpc.service
deleted file mode 100644
index 877a0ebb..00000000
--- a/conf/systemd/sfrpc.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Frp run-as Root Client Service
-#README.md
-Documentation=https://github.com/fatedier/frp/blob/master/README.md
-After=network.target
-
-[Service]
-Type=simple
-User=root
-Restart=on-failure
-ExecStart=/usr/bin/frpc -c /etc/frp/sfrpc.ini
-ExecReload=/usr/bin/frpc reload -c /etc/frp/sfrpc.ini
-StandardOutput=syslog
-
-[Install]
-Alias=sfrp.service
-Alias=sfrp-client.service
-Alias=frpc_run-as_root.service
-WantedBy=multi-user.target
diff --git a/conf/systemd/sfrpc@.service b/conf/systemd/sfrpc@.service
deleted file mode 100644
index 6d6c87c8..00000000
--- a/conf/systemd/sfrpc@.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Frp run-as Root Client Service
-#README.md
-Documentation=https://github.com/fatedier/frp/blob/master/README.md
-After=network.target
-
-[Service]
-Type=simple
-User=root
-Restart=on-failure
-ExecStart=/usr/bin/frpc -c /etc/frp/%i.ini
-ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini
-StandardOutput=syslog
-
-[Install]
-Alias=sfrp@.service
-Alias=sfrp-client@.service
-Alias=frpc_run-as_root@.service
-WantedBy=multi-user.target
diff --git a/conf/systemd/sfrps.service b/conf/systemd/sfrps.service
deleted file mode 100644
index e4507b7d..00000000
--- a/conf/systemd/sfrps.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Frp run-as Root Server Service
-#README.md
-Documentation=https://github.com/fatedier/frp/blob/master/README.md
-After=network.target
-
-[Service]
-Type=simple
-User=root
-Restart=on-failure
-ExecStart=/usr/bin/frps -c /etc/frp/sfrps.ini
-StandardOutput=syslog
-
-[Install]
-Alias=sfrpd.service
-Alias=sfrp-server.service
-Alias=frps_run-as_root.service
-WantedBy=multi-user.target
diff --git a/conf/systemd/sfrps@.service b/conf/systemd/sfrps@.service
deleted file mode 100644
index f54a87b3..00000000
--- a/conf/systemd/sfrps@.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Frp run-as Root Server Service
-#README.md
-Documentation=https://github.com/fatedier/frp/blob/master/README.md
-After=network.target
-
-[Service]
-Type=simple
-User=root
-Restart=on-failure
-ExecStart=/usr/bin/frps -c /etc/frp/%i.ini
-StandardOutput=syslog
-
-[Install]
-Alias=sfrpd@.service
-Alias=sfrp-server@.service
-Alias=frps_run-as_root@.service
-WantedBy=multi-user.target