Browse Source

Merge pull request #235 from n-connect/master

Core dump fix and rc.d scripts optimisation for FreeBSD
RustDesk 2 years ago
parent
commit
336b281657
3 changed files with 4 additions and 5 deletions
  1. 1 1
      Cargo.toml
  2. 1 2
      rcd/rustdesk-hbbr
  3. 2 2
      rcd/rustdesk-hbbs

+ 1 - 1
Cargo.toml

@@ -46,7 +46,7 @@ tungstenite = "0.17"
46
 regex = "1.4"
46
 regex = "1.4"
47
 tower-http = { version = "0.3", features = ["fs", "trace", "cors"] }
47
 tower-http = { version = "0.3", features = ["fs", "trace", "cors"] }
48
 http = "0.2"
48
 http = "0.2"
49
-flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset"] }
49
+flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset", "dont_minimize_extra_stacks"] }
50
 ipnetwork = "0.20"
50
 ipnetwork = "0.20"
51
 local-ip-address = "0.5.1"
51
 local-ip-address = "0.5.1"
52
 dns-lookup = "1.0.8"
52
 dns-lookup = "1.0.8"

+ 1 - 2
rcd/rustdesk-hbbr

@@ -25,7 +25,7 @@ rcvar=rustdesk_hbbr_enable
25
 load_rc_config $name
25
 load_rc_config $name
26
 
26
 
27
 : ${rustdesk_hbbr_enable:=NO}
27
 : ${rustdesk_hbbr_enable:=NO}
28
-: ${rustdesk_hbbr_args:=""}
28
+: ${rustdesk_hbbr_args="-k _"}
29
 : ${rustdesk_hbbr_user:=rustdesk}
29
 : ${rustdesk_hbbr_user:=rustdesk}
30
 : ${rustdesk_hbbr_group:=rustdesk}
30
 : ${rustdesk_hbbr_group:=rustdesk}
31
 
31
 
@@ -33,7 +33,6 @@ pidfile=/var/run/rustdesk_hbbr.pid
33
 command=/usr/sbin/daemon
33
 command=/usr/sbin/daemon
34
 procname=/usr/local/sbin/hbbr
34
 procname=/usr/local/sbin/hbbr
35
 rustdesk_hbbr_chdir="/var/lib/rustdesk-server/"
35
 rustdesk_hbbr_chdir="/var/lib/rustdesk-server/"
36
-rustdesk_hbbr_args="-k _"
37
 command_args="-p ${pidfile} -o /var/log/rustdesk-hbbr.log ${procname} ${rustdesk_hbbr_args}"
36
 command_args="-p ${pidfile} -o /var/log/rustdesk-hbbr.log ${procname} ${rustdesk_hbbr_args}"
38
 ## If you want the daemon do its log over syslog comment out the above line and remove the comment from the below replacement
37
 ## If you want the daemon do its log over syslog comment out the above line and remove the comment from the below replacement
39
 #command_args="-p ${pidfile} -T ${name} ${procname} ${rustdesk_hbbr_args}"
38
 #command_args="-p ${pidfile} -T ${name} ${procname} ${rustdesk_hbbr_args}"

+ 2 - 2
rcd/rustdesk-hbbs

@@ -25,7 +25,8 @@ rcvar=rustdesk_hbbs_enable
25
 load_rc_config $name
25
 load_rc_config $name
26
 
26
 
27
 : ${rustdesk_hbbs_enable:=NO}
27
 : ${rustdesk_hbbs_enable:=NO}
28
-: ${rustdesk_hbbs_args:=""}
28
+: ${rustdesk_hbbs_ip:=127.0.0.1}
29
+: ${rustdesk_hbbs_args="-r ${rustdesk_hbbs_ip} -k _"}
29
 : ${rustdesk_hbbs_user:=rustdesk}
30
 : ${rustdesk_hbbs_user:=rustdesk}
30
 : ${rustdesk_hbbs_group:=rustdesk}
31
 : ${rustdesk_hbbs_group:=rustdesk}
31
 
32
 
@@ -33,7 +34,6 @@ pidfile=/var/run/rustdesk_hbbs.pid
33
 command=/usr/sbin/daemon
34
 command=/usr/sbin/daemon
34
 procname=/usr/local/sbin/hbbs
35
 procname=/usr/local/sbin/hbbs
35
 rustdesk_hbbs_chdir="/var/lib/rustdesk-server/"
36
 rustdesk_hbbs_chdir="/var/lib/rustdesk-server/"
36
-rustdesk_hbbs_args="-r your.ip.add.ress -k _"
37
 command_args="-p ${pidfile} -o /var/log/rustdesk-hbbs.log ${procname} ${rustdesk_hbbs_args}"
37
 command_args="-p ${pidfile} -o /var/log/rustdesk-hbbs.log ${procname} ${rustdesk_hbbs_args}"
38
 ## If you want the daemon do its log over syslog comment out the above line and remove the comment from the below replacement
38
 ## If you want the daemon do its log over syslog comment out the above line and remove the comment from the below replacement
39
 #command_args="-p ${pidfile} -T ${name} ${procname} ${rustdesk_hbbs_args}"
39
 #command_args="-p ${pidfile} -T ${name} ${procname} ${rustdesk_hbbs_args}"