Last systemd and procd configuration submission

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_open_instance "${NAME}"
-    procd_set_param command "${PROG}" -c "${CONFFILE}"
+    procd_set_param command "${PROG}" -c "${CONFIGFILE}"
-    procd_set_param file "${CONFFILE}"
+    procd_set_param file "${CONFIGFILE}"
-    procd_set_param user nobody
     procd_set_param respawn
     
-    procd_set_param watch network.interface
+    procd_set_param user nobody #root can use 1~1024 ports
-    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}"
 }

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_open_instance "${NAME}"
-    procd_set_param command "${PROG}" -c "${CONFFILE}"
+    procd_set_param command "${PROG}" -c "${CONFIGFILE}"
-    procd_set_param file "${CONFFILE}"
+    procd_set_param file "${CONFIGFILE}"
-    procd_set_param user nobody
     procd_set_param respawn
     
-    procd_set_param watch network.interface
+    procd_set_param user nobody #root can use 1~1024 ports
-    procd_set_param netdev dev
+    
     procd_set_param stdout 1
     procd_set_param stderr 1
     procd_close_instance

conf/procd/sfrpc

@@ -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
-}

conf/procd/sfrps

@@ -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
-}

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
+ExecStart=/usr/bin/frpc -c /etc/frp/client/frpc.ini
-ExecReload=/usr/bin/frpc reload -c /etc/frp/frpc.ini
+ExecReload=/usr/bin/frpc reload -c /etc/frp/client/frpc.ini
 StandardOutput=syslog
 
 [Install]

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
+ExecStart=/usr/bin/frpc -c /etc/frp/client/%i.ini
-ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini
+ExecReload=/usr/bin/frpc reload -c /etc/frp/client/%i.ini
 StandardOutput=syslog
 
 [Install]

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]

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]

conf/systemd/sfrpc.service

@@ -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

conf/systemd/sfrpc@.service

@@ -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

conf/systemd/sfrps.service

@@ -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

conf/systemd/sfrps@.service

@@ -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