From c1c9ce5a4bb344694d1e617ee5bbdc72e88bcb3c Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Tue, 2 Dec 2008 14:18:26 +0000 Subject: Modify chrony to detect comments more accurately. git-svn-id: svn://svn.alpinelinux.org/acf/chrony/trunk@1617 ab2d0c66-481e-0410-8bed-d214d4d58bed --- chrony-model.lua | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/chrony-model.lua b/chrony-model.lua index f2be0b1..c7f0a73 100644 --- a/chrony-model.lua +++ b/chrony-model.lua @@ -29,19 +29,16 @@ function getconfig() output.KEYFILE = cfe({value="/etc/chrony/chrony.keys", label="keyfile"}) output.LOGDIR = cfe({value="/var/log/chrony", label="logdir"}) ---require ("html") - - local config = format.parse_configfile(fs.read_file(configfile)) - if config then - output.SERVER.value = config.server or output.SERVER.value - output.ALLOW.value = config.allow or output.ALLOW.value - output.DRIFTFILE.value = config.driftfile or output.DRIFTFILE.value - output.KEYFILE.value = config.keyfile or output.KEYFILE.value - output.LOGDIR.value = config.logdir or output.LOGDIR.value - end ---APP.logevent(html.cfe_unpack(output)) ---APP.logevent(html.cfe_unpack(config)) -return cfe({ type="group", value=output, label="Chrony Config" }) + local config = format.parse_configfile(fs.read_file(configfile), "[!;#%]") + if config then + output.SERVER.value = config.server or output.SERVER.value + output.ALLOW.value = config.allow or output.ALLOW.value + output.DRIFTFILE.value = config.driftfile or output.DRIFTFILE.value + output.KEYFILE.value = config.keyfile or output.KEYFILE.value + output.LOGDIR.value = config.logdir or output.LOGDIR.value + end + + return cfe({ type="group", value=output, label="Chrony Config" }) end -- cgit v1.2.3