nodogsplash: make missing config options available through uci

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index ca223b7390a392387ec71ec1d0c6210636079be0..38e8f2b152811e9c9f9f6305b1c2a69b2f4b67af 100644 (file)
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=nodogsplash
 PKG_FIXUP:=autoreconf
 PKG_VERSION:=0.9_beta9.9.9
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 463ff91b04432bf11e15a30f40854c7ec5671964..3352aa9f7e2ed1bedf86da0816c0511eb35936d4 100755 (executable)
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -172,6 +172,13 @@ generate_uci_config() {
   append_config_option "$CONFIGFILE" "$cfg" gatewayaddress GatewayAddress
   append_config_option "$CONFIGFILE" "$cfg" gatewayport GatewayPort
   append_config_option "$CONFIGFILE" "$cfg" maxclients MaxClients
+  append_config_option "$CONFIGFILE" "$cfg" webroot webroot
+  append_config_option "$CONFIGFILE" "$cfg" debuglevel debuglevel
+  append_config_option "$CONFIGFILE" "$cfg" splashpage splashpage
+  append_config_option "$CONFIGFILE" "$cfg" pagesdir pagesdir
+  append_config_option "$CONFIGFILE" "$cfg" checkinterval checkinterval
+  append_config_option "$CONFIGFILE" "$cfg" syslogfacility syslogfacility
+  append_config_option "$CONFIGFILE" "$cfg" gatewayiprange gatewayiprange
   append_config_option "$CONFIGFILE" "$cfg" imagedir ImagesDir
   append_config_option "$CONFIGFILE" "$cfg" redirecturl RedirectURL
   append_config_option "$CONFIGFILE" "$cfg" clientidletimeout ClientIdleTimeout
@@ -181,6 +188,22 @@ generate_uci_config() {
   append_config_option "$CONFIGFILE" "$cfg" macmechanism MACMechanism
   append_config_option "$CONFIGFILE" "$cfg" uploadlimit UploadLimit
   append_config_option "$CONFIGFILE" "$cfg" downloadlimit DownloadLimit
+  append_config_option "$CONFIGFILE" "$cfg" remoteauthenticatoraction remoteauthenticatoraction
+  append_config_option "$CONFIGFILE" "$cfg" enablepreauth enablepreauth
+  append_config_option "$CONFIGFILE" "$cfg" binvoucher binvoucher
+  append_config_option "$CONFIGFILE" "$cfg" forcevoucher forcevoucher
+  append_config_option "$CONFIGFILE" "$cfg" passwordauthentication passwordauthentication
+  append_config_option "$CONFIGFILE" "$cfg" usernameauthentication usernameauthentication
+  append_config_option "$CONFIGFILE" "$cfg" passwordattempts passwordattempts
+  append_config_option "$CONFIGFILE" "$cfg" username username
+  append_config_option "$CONFIGFILE" "$cfg" password password
+  append_config_option "$CONFIGFILE" "$cfg" authenticateimmediately authenticateimmediately
+  append_config_option "$CONFIGFILE" "$cfg" decongesthttpdthreads decongesthttpdthreads
+  append_config_option "$CONFIGFILE" "$cfg" httpdthreadthreshold httpdthreadthreshold
+  append_config_option "$CONFIGFILE" "$cfg" httpdthreaddelayms httpdthreaddelayms
+  append_config_option "$CONFIGFILE" "$cfg" fw_mark_authenticated fw_mark_authenticated
+  append_config_option "$CONFIGFILE" "$cfg" fw_mark_trusted fw_mark_trusted
+  append_config_option "$CONFIGFILE" "$cfg" fw_mark_blocked fw_mark_blocked
 
   config_get download "$cfg" downloadlimit
   config_get upload "$cfg" uploadlimit