CVS commit: pkgsrc/net/syncthing/files

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul 17 01:37:11 UTC 2019

Modified Files:
        pkgsrc/net/syncthing/files: syncthing.sh

Log Message:
syncthing: various rc.subr script changes

- redirect stdout to /dev/null to avoid duplicating output that is already
  logged to a file
- use load_rc_config after setting defaults in order to allow overriding
  them in the local rc.conf

from David Brownlee


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/syncthing/files/syncthing.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/syncthing/files/syncthing.sh
diff -u pkgsrc/net/syncthing/files/syncthing.sh:1.1 pkgsrc/net/syncthing/files/syncthing.sh:1.2
--- pkgsrc/net/syncthing/files/syncthing.sh:1.1 Fri May 24 19:25:55 2019
+++ pkgsrc/net/syncthing/files/syncthing.sh     Wed Jul 17 01:37:11 2019
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: syncthing.sh,v 1.1 2019/05/24 19:25:55 nia Exp $
+# $NetBSD: syncthing.sh,v 1.2 2019/07/17 01:37:11 nia Exp $
 #
 # PROVIDE: syncthing
 # REQUIRE: DAEMON
@@ -10,6 +10,8 @@
 name="syncthing"
 rcvar=${name}
 
+load_rc_config $name
+
 : ${syncthing_user:=@SYNCTHING_USER@}
 : ${syncthing_user_home:=@VARBASE@/db/syncthing}
 : ${syncthing_group:=@SYNCTHING_GROUP@}
@@ -18,7 +20,7 @@ rcvar=${name}
 
 command="@PREFIX@/bin/syncthing"
 command_args="-logfile ${syncthing_logfile}"
-command_args="${command_args} -home ${syncthing_home} &"
+command_args="${command_args} -home ${syncthing_home} > /dev/null &"
 
 syncthing_env="STNODEFAULTFOLDER=1"
 syncthing_env="${syncthing_env} USER=${syncthing_user}"
@@ -33,5 +35,4 @@ syncthing_precmd()
        @CHMOD@ 0750 ${syncthing_logfile}
 }
 
-load_rc_config $name
 run_rc_command "$1"