diff options
| author | Mika Havela <mika.havela@gmail.com> | 2008-05-05 15:44:37 +0000 |
|---|---|---|
| committer | Mika Havela <mika.havela@gmail.com> | 2008-05-05 15:44:37 +0000 |
| commit | 1b8bad95d1204e4f3f90bfe4f212870d09c44918 (patch) | |
| tree | 67fc5130f8dae4d489876f444ad682e7cffe6eca /squid-controller.lua | |
| parent | ea937c7c3628041c298289c3859a95a63ba09f47 (diff) | |
| download | acf-squid-1b8bad95d1204e4f3f90bfe4f212870d09c44918.tar.bz2 acf-squid-1b8bad95d1204e4f3f90bfe4f212870d09c44918.tar.xz | |
Moved around the information on the view-files to reflect the same layout as other ACF's.
Added information on autostart sequence.
Fetch programversion the same way as other acf's do (apk_version -v).
git-svn-id: svn://svn.alpinelinux.org/acf/squid/trunk@1102 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'squid-controller.lua')
| -rw-r--r-- | squid-controller.lua | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/squid-controller.lua b/squid-controller.lua index ebc6133..8ffe0cb 100644 --- a/squid-controller.lua +++ b/squid-controller.lua @@ -22,7 +22,12 @@ end basic = function( self ) - local info = { status = { value = "stopped" }, version = { value = self.model.get_squid_version() }, srvctrl = { value = srvctrl} }; + local info = { + status=self.model.get_status(), + version = self.model.get_squid_version(), + autostart = self.model.get_autostart(), + srvctrl = { value = srvctrl} + } local option = { script = ENV["SCRIPT_NAME"], prefix = self.conf.prefix, @@ -63,7 +68,7 @@ basic = function( self ) end service.status = self.model.get_status() - info.status.value = service.status; +-- info.status.value = service.status; service.config, service.error = self.model.get_basic_config() return ( cfe ({ option = option, service = service, info = info }) ) @@ -71,7 +76,12 @@ end authentication = function( self ) - local info = { status = { value = "stopped" }, version = { value = self.model.get_squid_version() }, srvctrl = { value = srvctrl} }; + local info = { + status=self.model.get_status(), + version = self.model.get_squid_version(), + autostart = self.model.get_autostart(), + srvctrl = { value = srvctrl} + } local option = { script = ENV["SCRIPT_NAME"], prefix = self.conf.prefix, @@ -110,7 +120,7 @@ authentication = function( self ) end service.status = self.model.get_status() - info.status.value = service.status +-- info.status.value = service.status service.config, service.error = self.model.get_basic_config() return ( cfe ({ option = option, service = service, info = info }) ) @@ -118,7 +128,12 @@ end advanced = function( self ) - local info = { status = { value = "stopped" }, version = { value = self.model.get_squid_version() }, srvctrl = { value = srvctrl} }; + local info = { + status=self.model.get_status(), + version = self.model.get_squid_version(), + autostart = self.model.get_autostart(), + srvctrl = { value = srvctrl} + } local option = { script = ENV["SCRIPT_NAME"], prefix = self.conf.prefix, @@ -142,7 +157,7 @@ advanced = function( self ) end service.status = self.model.get_status() - info.status.value = service.status +-- info.status.value = service.status service.config = self.model.get_adv_config() return ( cfe ({ option = option, service = service, info = info }) ) |