diff options
Diffstat (limited to 'openntpd-controller.lua')
| -rw-r--r-- | openntpd-controller.lua | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/openntpd-controller.lua b/openntpd-controller.lua index 6a22744..b7d8c8e 100644 --- a/openntpd-controller.lua +++ b/openntpd-controller.lua @@ -19,7 +19,7 @@ mvc.on_load = function(self, parent) end -settings = function (self) +config = function (self) local cmd = self.clientdata.cmd local errors = {} local modify_opts = nil @@ -76,12 +76,12 @@ settings = function (self) if ( cmd ~= nil ) then local startstop = self.model:startstop_service( cmd ) posix.sleep(1) -- Wait for the process to start|stop - return ( {statusinfo = self.model:get(), + return ( {status = self.model:get(), startstop = "", modify_opts=modify_opts, url = url } ) else - return ( {statusinfo = self.model:get(), startstop = "", + return ( {status = self.model:get(), startstop = "", errors = errors, modify_opts=modify_opts, url = url, @@ -94,35 +94,35 @@ logfile = function (self) return ( {logfile = self.model:get_logfile(), url = url } ) end -read = function (self) +status = function (self) local cmd = self.clientdata.cmd local url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller - return ( {statusinfo = self.model:get(), url = url } ) + return ( {status = self.model:get(), url = url } ) end -advanced = function (self) - local filecontent = self.clientdata.modifications or "" +expert = function (self) + local file = self.clientdata.modifications or "" local cmd = self.clientdata.cmd local url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller - if ( filecontent ~= "") then - local me = ( {filecontent = self.model:update_filecontent(filecontent), url = url } ) + if ( file ~= "") then + local me = ( {file = self.model:update_filecontent(file), url = url } ) return ( {startstop = "", - statusinfo = self.model:get(), - filecontent = self.model:get_filecontent(), + status = self.model:get(), + file = self.model:get_filecontent(), url = url } ) else if ( cmd ~= nil ) then local startstop = self.model:startstop_service( cmd ) posix.sleep(1) -- Wait for the process to start|stop return ( {startstop = startstop, - statusinfo = self.model:get(), - filecontent = self.model:get_filecontent(), + status = self.model:get(), + filec = self.model:get_filecontent(), url = url } ) else return ( {startstop = "", - statusinfo = self.model:get(), - filecontent = self.model:get_filecontent(), + status = self.model:get(), + file = self.model:get_filecontent(), url = url } ) end end |