Merge branch 'master' of http://wagnertech.de/git/projects

diff --git a/Test/timetracker/.dummy b/Test/timetracker/.dummy
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/frp/frpc.service b/frp/frpc.service
index 2b3f7dbeb4776726629af328a6f2662697d0c520..6fafabbb7de856e120a334b2dec3de857e73f5f8 100644 (file)
--- a/frp/frpc.service
+++ b/frp/frpc.service
@@ -1,14 +1,15 @@
 [Unit]
-Description=FRPS fast reverse proxy client
+Description=FRPC fast reverse proxy client
 After=network-online.target
 
 [Service]
 ExecStart=/usr/bin/frpc -c /etc/frpc.toml
 KillMode=process
 Restart=on-failure
+RestartSec=3
 Type=simple
 
 [Install]
 WantedBy=multi-user.target
-Alias=frps.service
+Alias=frpc.service
 

diff --git a/frp/frps.service b/frp/frps.service
index ea6b5fc1b2eeb6f059f8e1bcb3b9c378da64592c..a247f87b30ad653bdf6cf90689dfacb4c4f85628 100644 (file)
--- a/frp/frps.service
+++ b/frp/frps.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=FRPS fast reverse proxy server
-After=After=network-online.target
+After=network-online.target
 
 [Service]
 ExecStart=/usr/bin/frps -c /etc/frps.toml
 KillMode=process
 Restart=on-failure
+RestartSec=3
 Type=simple
 
 [Install]