From: Florian Eckert Date: Thu, 7 Nov 2019 10:40:31 +0000 (+0100) Subject: uhttpd: add enable instance option X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;ds=sidebyside;h=ee2014e68019c4150b9dda0cf9f140cdf6faada9;p=openwrt%2Fstaging%2Fdedeckeh.git uhttpd: add enable instance option With this change it is now possible to switch off single instances of the uhttpd config. Until now it was only possible to switch all instances of uhttpd on or off. Signed-off-by: Florian Eckert --- diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 36dbe636ae..daa5667854 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 6322473b97..869f79bea2 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -98,6 +98,10 @@ start_instance() local cfg="$1" local realm="$(uci_get system.@system[0].hostname)" local listen http https interpreter indexes path handler httpdconf haveauth + local enabled + + config_get_bool enabled "$cfg" 'enabled' 1 + [ $enabled -gt 0 ] || return procd_open_instance procd_set_param respawn