Merge pull request #4675 from dibdot/dnscrypt-proxy

dnscrypt-proxy: start from procd interface trigger, not in init

net/dnscrypt-proxy/Makefile

@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnscrypt-proxy
 PKG_VERSION:=1.9.5
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.dnscrypt.org/dnscrypt-proxy \

net/dnscrypt-proxy/files/dnscrypt-proxy.config

@@ -1,3 +1,9 @@
+config global
+	# start dnscrypt-proxy from procd interface trigger rather than immediately in init
+	# if needed you can restrict trigger to certain interface(s)
+	# list procd_trigger 'wan'
+	# list procd_trigger 'wan6'
+
 config dnscrypt-proxy ns1
 	option address '127.0.0.1'
 	option port '5353'

net/dnscrypt-proxy/files/dnscrypt-proxy.init

@@ -6,6 +6,11 @@ PROG=/usr/sbin/dnscrypt-proxy
 CONFIG_DIR=/var/etc
 USER=nobody
 
+boot() {
+    dnscrypt_boot=1
+    rc_procd start_service
+}
+
 dnscrypt_instance() {
     local config_path="$CONFIG_DIR/dnscrypt-proxy-$1.conf"
     create_config_file $1 "$config_path"
@@ -133,10 +138,27 @@ append_blacklists() {
 }
 
 start_service() {
+    if [ -n "${dnscrypt_boot}" ]
+    then
+        return 0
+    fi
     config_load dnscrypt-proxy
     config_foreach dnscrypt_instance dnscrypt-proxy
 }
 
 service_triggers() {
+    local trigger
+    local triggerlist="$(uci_get dnscrypt-proxy.@global[0].procd_trigger)"
+
+    PROCD_RELOAD_DELAY=2000
+    if [ -n "${triggerlist}" ]
+    then
+        for trigger in ${triggerlist}
+        do
+            procd_add_interface_trigger "interface.*.up" "${trigger}" /etc/init.d/dnscrypt-proxy reload
+        done
+    else
+        procd_add_raw_trigger "interface.*.up" 2000 /etc/init.d/dnscrypt-proxy reload
+    fi
     procd_add_reload_trigger 'dnscrypt-proxy'
 }