diff options
| author | RustDesk <[email protected]> | 2023-04-01 17:31:58 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-04-01 17:31:58 +0800 |
| commit | 336b281657f686c256f38796ac831386a33f34b7 (patch) | |
| tree | 192244b70e66ed0376a62742205716d6709b205c | |
| parent | 7bbed69ad266dba6547b28a078131cc9b116f5bd (diff) | |
| parent | 57898642e81a2935a42a353fb13b0f7e61efe60e (diff) | |
| download | rustdesk-server-1.1.7-4.tar.gz rustdesk-server-1.1.7-4.zip | |
Merge pull request #235 from n-connect/master1.1.7-4
Core dump fix and rc.d scripts optimisation for FreeBSD
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | rcd/rustdesk-hbbr | 3 | ||||
| -rw-r--r-- | rcd/rustdesk-hbbs | 4 |
3 files changed, 4 insertions, 5 deletions
@@ -46,7 +46,7 @@ tungstenite = "0.17" regex = "1.4" tower-http = { version = "0.3", features = ["fs", "trace", "cors"] } http = "0.2" -flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset"] } +flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset", "dont_minimize_extra_stacks"] } ipnetwork = "0.20" local-ip-address = "0.5.1" dns-lookup = "1.0.8" diff --git a/rcd/rustdesk-hbbr b/rcd/rustdesk-hbbr index 0cd9027..15583a9 100644 --- a/rcd/rustdesk-hbbr +++ b/rcd/rustdesk-hbbr @@ -25,7 +25,7 @@ rcvar=rustdesk_hbbr_enable load_rc_config $name : ${rustdesk_hbbr_enable:=NO} -: ${rustdesk_hbbr_args:=""} +: ${rustdesk_hbbr_args="-k _"} : ${rustdesk_hbbr_user:=rustdesk} : ${rustdesk_hbbr_group:=rustdesk} @@ -33,7 +33,6 @@ pidfile=/var/run/rustdesk_hbbr.pid command=/usr/sbin/daemon procname=/usr/local/sbin/hbbr rustdesk_hbbr_chdir="/var/lib/rustdesk-server/" -rustdesk_hbbr_args="-k _" command_args="-p ${pidfile} -o /var/log/rustdesk-hbbr.log ${procname} ${rustdesk_hbbr_args}" ## If you want the daemon do its log over syslog comment out the above line and remove the comment from the below replacement #command_args="-p ${pidfile} -T ${name} ${procname} ${rustdesk_hbbr_args}" diff --git a/rcd/rustdesk-hbbs b/rcd/rustdesk-hbbs index 4bceb5b..debdcc3 100644 --- a/rcd/rustdesk-hbbs +++ b/rcd/rustdesk-hbbs @@ -25,7 +25,8 @@ rcvar=rustdesk_hbbs_enable load_rc_config $name : ${rustdesk_hbbs_enable:=NO} -: ${rustdesk_hbbs_args:=""} +: ${rustdesk_hbbs_ip:=127.0.0.1} +: ${rustdesk_hbbs_args="-r ${rustdesk_hbbs_ip} -k _"} : ${rustdesk_hbbs_user:=rustdesk} : ${rustdesk_hbbs_group:=rustdesk} @@ -33,7 +34,6 @@ pidfile=/var/run/rustdesk_hbbs.pid command=/usr/sbin/daemon procname=/usr/local/sbin/hbbs rustdesk_hbbs_chdir="/var/lib/rustdesk-server/" -rustdesk_hbbs_args="-r your.ip.add.ress -k _" command_args="-p ${pidfile} -o /var/log/rustdesk-hbbs.log ${procname} ${rustdesk_hbbs_args}" ## If you want the daemon do its log over syslog comment out the above line and remove the comment from the below replacement #command_args="-p ${pidfile} -T ${name} ${procname} ${rustdesk_hbbs_args}" |