Просмотр исходного кода

Merge pull request #210 from n-connect/master

Log files enables
RustDesk лет назад: 2
Родитель
Сommit
13321b5a90
2 измененных файлов с 21 добавлено и 5 удалено
  1. 12 3
      rcd/rustdesk-hbbr
  2. 9 2
      rcd/rustdesk-hbbs

+ 12 - 3
rcd/rustdesk-hbbr

@@ -15,6 +15,7 @@
15
 #               Default is "root".
15
 #               Default is "root".
16
 # rustdesk_hbbr_group (string):           Set group that rustdesk_hbbr will run under
16
 # rustdesk_hbbr_group (string):           Set group that rustdesk_hbbr will run under
17
 #               Default is "wheel".
17
 #               Default is "wheel".
18
+
18
 . /etc/rc.subr
19
 . /etc/rc.subr
19
 
20
 
20
 name=rustdesk_hbbr
21
 name=rustdesk_hbbr
@@ -33,7 +34,7 @@ command=/usr/sbin/daemon
33
 procname=/usr/local/sbin/hbbr
34
 procname=/usr/local/sbin/hbbr
34
 rustdesk_hbbr_chdir="/var/lib/rustdesk-server/"
35
 rustdesk_hbbr_chdir="/var/lib/rustdesk-server/"
35
 rustdesk_hbbr_args="-k _"
36
 rustdesk_hbbr_args="-k _"
36
-command_args="-f -p ${pidfile} /usr/bin/env ${procname} ${rustdesk_hbbr_args}"
37
+command_args="-p ${pidfile} -o /var/log/rustdesk-hbbr.log ${procname} ${rustdesk_hbbr_args}"
37
 
38
 
38
 start_precmd=rustdesk_hbbr_startprecmd
39
 start_precmd=rustdesk_hbbr_startprecmd
39
 
40
 
@@ -48,8 +49,16 @@ rustdesk_hbbr_startprecmd()
48
         chown -R ${rustdesk_hbbr_user}:${rustdesk_hbbr_group} ${rustdesk_hbbr_chdir};
49
         chown -R ${rustdesk_hbbr_user}:${rustdesk_hbbr_group} ${rustdesk_hbbr_chdir};
49
         chmod -R 770 ${rustdesk_hbbr_chdir};
50
         chmod -R 770 ${rustdesk_hbbr_chdir};
50
     else
51
     else
51
-        mkdir -m 7et nonu
52
-0 ${rustdesk_hbbr_chdir};
52
+        mkdir -m 770 ${rustdesk_hbbr_chdir};
53
         chown ${rustdesk_hbbr_user}:${rustdesk_hbbr_group} ${rustdesk_hbbr_chdir};
53
         chown ${rustdesk_hbbr_user}:${rustdesk_hbbr_group} ${rustdesk_hbbr_chdir};
54
     fi
54
     fi
55
+    if [ -e /var/log/rustdesk-hbbr.log ]; then
56
+        chown -R ${rustdesk_hbbr_user}:${rustdesk_hbbr_group} /var/log/rustdesk-hbbr.log;
57
+        chmod 660 /var/log/rustdesk-hbbr.log;
58
+    else
59
+        install -o ${rustdesk_hbbr_user} -g ${rustdesk_hbbr_group} /dev/null /var/log/rustdesk-hbbr.log;
60
+        chmod 660 /var/log/rustdesk-hbbr.log;
61
+    fi
55
 }
62
 }
63
+
64
+run_rc_command "$1"

+ 9 - 2
rcd/rustdesk-hbbs

@@ -33,8 +33,8 @@ pidfile=/var/run/rustdesk_hbbs.pid
33
 command=/usr/sbin/daemon
33
 command=/usr/sbin/daemon
34
 procname=/usr/local/sbin/hbbs
34
 procname=/usr/local/sbin/hbbs
35
 rustdesk_hbbs_chdir="/var/lib/rustdesk-server/"
35
 rustdesk_hbbs_chdir="/var/lib/rustdesk-server/"
36
-rustdesk_hbbs_args="-r your.ip.add.ress -k _"
37
-command_args="-f -p ${pidfile} /usr/bin/env ${procname} ${rustdesk_hbbs_args}"
36
+rustdesk_hbbs_args="-r 130.255.77.37 -k _"
37
+command_args="-p ${pidfile} -o /var/log/rustdesk-hbbs.log ${procname} ${rustdesk_hbbs_args}"
38
 
38
 
39
 start_precmd=rustdesk_hbbs_startprecmd
39
 start_precmd=rustdesk_hbbs_startprecmd
40
 
40
 
@@ -52,6 +52,13 @@ rustdesk_hbbs_startprecmd()
52
         mkdir -m 770 ${rustdesk_hbbs_chdir};
52
         mkdir -m 770 ${rustdesk_hbbs_chdir};
53
         chown ${rustdesk_hbbs_user}:${rustdesk_hbbs_group} ${rustdesk_hbbs_chdir};
53
         chown ${rustdesk_hbbs_user}:${rustdesk_hbbs_group} ${rustdesk_hbbs_chdir};
54
     fi
54
     fi
55
+    if [ -e /var/log/rustdesk-hbbs.log ]; then
56
+        chown -R ${rustdesk_hbbs_user}:${rustdesk_hbbs_group} /var/log/rustdesk-hbbs.log;
57
+        chmod 660 /var/log/rustdesk-hbbs.log;
58
+    else
59
+        install -o ${rustdesk_hbbs_user} -g ${rustdesk_hbbs_group} /dev/null /var/log/rustdesk-hbbs.log;
60
+        chmod 660 /var/log/rustdesk-hbbs.log;
61
+    fi
55
 }
62
 }
56
 
63
 
57
 run_rc_command "$1"
64
 run_rc_command "$1"