summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-05-07 17:37:37 +0000
committerTed Trask <ttrask01@yahoo.com>2008-05-07 17:37:37 +0000
commit5f129635dc07aef6f1749ca24d1b43ff08bedd7e (patch)
tree80ef5a8bf0f780bd6dcd7860a6ef0ab01fa51aca
parente64e5bfdf9eb2d83d01b808e11becbfcb8998158 (diff)
downloadacf-tinydns-5f129635dc07aef6f1749ca24d1b43ff08bedd7e.tar.bz2
acf-tinydns-5f129635dc07aef6f1749ca24d1b43ff08bedd7e.tar.xz
Rewrote getopts.getoptsfromfile function to handle more complicated config files and removed getopts.getoptsfromfile_onperline function
git-svn-id: svn://svn.alpinelinux.org/acf/tinydns/trunk@1111 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--tinydns-model.lua7
1 files changed, 3 insertions, 4 deletions
diff --git a/tinydns-model.lua b/tinydns-model.lua
index 29513ab..bdadc24 100644
--- a/tinydns-model.lua
+++ b/tinydns-model.lua
@@ -18,7 +18,7 @@ local packagename = "tinydns"
local processname = "tinydns"
local configfile = "/etc/conf.d/" .. processname
local baseurl = "/etc/tinydns"
-local initdoptions = getopts.getoptsfromfile_onperline("/etc/init.d/" .. processname)
+local initdoptions = getopts.getoptsfromfile("/etc/init.d/" .. processname, "")
if (initdoptions) then
configdir = initdoptions.DATADIR
datafile = initdoptions.ROOT .. "/data" or "/var/cache/data"
@@ -327,7 +327,6 @@ function getlocations(self,filter_type)
local config = {}
local configobjects = {}
local locations = {}
- local listenaddr = getopts.getoptsfromfile_onperline(configfile,"IP") or {}
-- Loop through all available configfiles
for k,v in pairs(configfiles) do
@@ -361,13 +360,13 @@ end
function getconfig(self,filter_type)
local config = {}
- local listenaddr = getopts.getoptsfromfile_onperline(configfile,"IP") or {}
+ local listenaddr = getopts.getoptsfromfile(configfile,"","IP") or ""
config.listen = cfe({
name = "listen",
label="IP address to listen on",
- value=listenaddr.IP or "",
+ value=listenaddr,
})
config.baseurl = cfe({