From d3179cb78a9e75faffeba5a92d3f43a4872338a4 Mon Sep 17 00:00:00 2001 From: Andreas Brodmann Date: Wed, 16 Jan 2008 14:47:54 +0000 Subject: unification of the different squid-views git-svn-id: svn://svn.alpinelinux.org/acf/squid/trunk@591 ab2d0c66-481e-0410-8bed-d214d4d58bed --- squid-controller.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'squid-controller.lua') diff --git a/squid-controller.lua b/squid-controller.lua index f6a90f2..1c093db 100644 --- a/squid-controller.lua +++ b/squid-controller.lua @@ -102,6 +102,8 @@ end authentication = function( self ) + local info = { status = { value = "stopped" }, version = { value = self.model.get_squid_version() }, srvctrl = { value = srvctrl} }; + local option = { script = ENV["SCRIPT_NAME"], prefix = self.conf.prefix, controller = self.conf.controller, @@ -139,9 +141,10 @@ authentication = function( self ) end service.status = self.model.get_status() + info.status.value = service.status service.config, service.error = self.model.get_basic_config() - return ( cfe ({ option = option, service = service }) ) + return ( cfe ({ option = option, service = service, info = info }) ) end advanced = function( self ) @@ -197,6 +200,8 @@ end ntlm = function( self ) + local info = { status = { value = "stopped" }, version = { value = self.model.get_winbind_version() }, srvctrl = { value = srvctrl} }; + local option = { script = ENV["SCRIPT_NAME"], prefix = self.conf.prefix, controller = self.conf.controller, @@ -219,9 +224,10 @@ ntlm = function( self ) end service.status = self.model.get_status_winbindd() + info.status.value = service.status service.config = self.model.get_winbindd_config() - return ( cfe ({ option = option, service = service }) ) + return ( cfe ({ option = option, service = service, info = info }) ) end saccess = function( self ) -- cgit v1.2.3