Add conf-file option.

Luci add custom.conf
Bugfix for timer
Update address matching.
This commit is contained in:
Nick Peng
2018-08-09 00:00:27 +08:00
parent 49510c9145
commit 56a273e3ed
12 changed files with 99 additions and 23 deletions

View File

@@ -8,6 +8,7 @@ SERVICE_DAEMONIZE=1
BASECONFIGFILE="/etc/smartdns/smartdns.conf"
SMARTDNS_CONF="/var/etc/smartdns.conf"
ADDRESS_CONF="/etc/smartdns/address.conf"
CUSTOM_CONF="/etc/smartdns/custom.conf"
SMARTDNS_CONF_TMP="${SMARTDNS_CONF}.tmp"
set_iptable()
@@ -141,8 +142,8 @@ start_service() {
config_foreach load_server "server"
echo "# address" >> $SMARTDNS_CONF_TMP
grep "^ *address " $ADDRESS_CONF >> $SMARTDNS_CONF_TMP
echo "conf-file $ADDRESS_CONF" >> $SMARTDNS_CONF_TMP
echo "conf-file $CUSTOM_CONF" >> $SMARTDNS_CONF_TMP
config_get_bool "enabled" "$section" "enabled" '0'
mv $SMARTDNS_CONF_TMP $SMARTDNS_CONF