syncthing: enable via config, lower priority, cleanup

Added the ability to enable/disable via a config file;
the default is enabled for backwards compatibility.

This is an additional service, so running it the
same priority as dnsmasq, etc does not make sense.

Added USE_PROCD=1

"done" starts at "START=95", so this should start earlier

Added STOP=10 to stop syncthing early

Compile-tested on: ipq806x, ipq40xx
Runtime-tested on: ipq806x, ipq40xx

Signed-off-by: Marc Benoit <redacted>

diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile
index 78474964fa4302bf9a37f85029e2990e89ac4122..f55f511d98f00180bad7136392443613fe1083e1 100644 (file)
--- a/utils/syncthing/Makefile
+++ b/utils/syncthing/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syncthing
 PKG_VERSION:=1.3.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION)

diff --git a/utils/syncthing/files/etc/config/syncthing b/utils/syncthing/files/etc/config/syncthing
index 9c17b68a5558d8599d8b72f7809b33343fdd5366..427c8c5b12f7f584a71b5660e86c89ebccbf5ac3 100644 (file)
--- a/utils/syncthing/files/etc/config/syncthing
+++ b/utils/syncthing/files/etc/config/syncthing
@@ -1,3 +1,7 @@
+
 config syncthing 'syncthing'
-    option gui_address 'http://127.0.0.1:8384'
-    option home '/etc/syncthing/'
+       option enabled '0'
+
+       option gui_address 'http://127.0.0.1:8384'
+       option home '/etc/syncthing/'
+

diff --git a/utils/syncthing/files/etc/init.d/syncthing b/utils/syncthing/files/etc/init.d/syncthing
index 1740351adc9d4c4e84f25b738d782fedbf3d5405..443ef4f359ab04b94d2e4ef085fad7518fc69adc 100755 (executable)
--- a/utils/syncthing/files/etc/init.d/syncthing
+++ b/utils/syncthing/files/etc/init.d/syncthing
@@ -1,14 +1,24 @@
 #!/bin/sh /etc/rc.common
 
-START=99
+START=90
+STOP=10
+
+USE_PROCD=1
+NICEPRIO=19
 
 PROG=/usr/bin/syncthing
 
 start_service() {
     [ -d /var/syncthing/ ] || mkdir /var/syncthing/
 
-    local gui_address home
+    local gui_address home enabled
     config_load "syncthing"
+
+    # The first version had the service enabled by default,
+    #   so preserving the old behaviour
+    config_get_bool enabled syncthing enabled 1
+    [ "$enabled" -gt 0 ] || return 0
+
     config_get gui_address syncthing gui_address "http://127.0.0.1:8384"
     config_get home syncthing home "/etc/syncthing/"
 
@@ -17,5 +27,6 @@ start_service() {
     procd_append_param command -gui-address="$gui_address"
     procd_append_param command -home="$home"
     procd_set_param respawn
+    procd_set_param nice "$NICEPRIO"
     procd_close_instance
 }