nodogsplash: fix uci configuration by fixing append_config_option

[feed/routing.git] / nodogsplash / files / nodogsplash.init

diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
index 463ff91b04432bf11e15a30f40854c7ec5671964..424058e4918dfda057f7e4dc439c6f056bf0f11f 100755 (executable)
--- a/nodogsplash/files/nodogsplash.init
+++ b/nodogsplash/files/nodogsplash.init
@@ -36,13 +36,13 @@ nolog() {
 # will append "BindAddress 192.168.1.1" if uci bind_address is '192.168.1.1'
 append_config_option() {
   local val=""
-  local cfg="$1"
-  local config_file="$2"
+  local config_file="$1"
+  local cfg="$2"
   local option_name="$3"
   local config_counterpart="$4"
   local default="$5"
   config_get val "$cfg" "$option_name" "$default"
-  [ -n "$val" ] && echo "" >> $config_file
+  [ -n "$val" ] && echo "$config_counterpart $val" >> $config_file
 }
 
 setup_user_authentication() {
@@ -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