From 6139e07d82b8ee23e05704f805164ad1e028a75b Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Thu, 17 Mar 2011 08:42:31 +0000
Subject: Removed health/modules action because redundant with modules/status

---
 alpine-baselayout.roles | 4 ++--
 health-controller.lua   | 4 ----
 health-model.lua        | 6 ------
 health-modules-html.lsp | 8 --------
 health.menu             | 1 -
 5 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 health-modules-html.lsp

diff --git a/alpine-baselayout.roles b/alpine-baselayout.roles
index 23cae01..257d8d8 100644
--- a/alpine-baselayout.roles
+++ b/alpine-baselayout.roles
@@ -1,5 +1,5 @@
 GUEST=hostname:read
-USER=cron:status,cron:startstop,health:system,health:storage,health:proc,health:network,health:modules,health:networkstats,interfaces:status,interfaces:read,interfaces:restart,logfiles:status,logfiles:view,logfiles:download,logfiles:tail,modules:status,syslog:status,syslog:loginfo,syslog:startstop,rc:status
+USER=cron:status,cron:startstop,health:system,health:storage,health:proc,health:network,health:networkstats,interfaces:status,interfaces:read,interfaces:restart,logfiles:status,logfiles:view,logfiles:download,logfiles:tail,modules:status,syslog:status,syslog:loginfo,syslog:startstop,rc:status
 EDITOR=cron:listjobs,hostname:edit,interfaces:delete,interfaces:create,interfaces:update,interfaces:ifup,interfaces:ifdown,logfiles:delete,syslog:config,rc:edit
 EXPERT=cron:editjob,cron:deletejob,cron:movejob,cron:createjob,cron:expert,syslog:expert,interfaces:editintfile,modules:edit,modules:reload
-ADMIN=cron:status,cron:startstop,cron:listjobs,cron:editjob,cron:deletejob,cron:movejob,cron:createjob,cron:expert,hostname:read,health:system,health:storage,health:proc,health:network,health:modules,health:networkstats,interfaces:status,interfaces:read,interfaces:restart,logfiles:status,logfiles:view,logfiles:download,logfiles:tail,modules:status,syslog:status,syslog:loginfo,syslog:startstop,rc:status,hostname:edit,interfaces:delete,interfaces:create,interfaces:update,interfaces:ifup,interfaces:ifdown,logfiles:delete,syslog:config,rc:edit,syslog:expert,interfaces:editintfile,modules:edit,modules:reload,password:edit
+ADMIN=cron:status,cron:startstop,cron:listjobs,cron:editjob,cron:deletejob,cron:movejob,cron:createjob,cron:expert,hostname:read,health:system,health:storage,health:proc,health:network,health:networkstats,interfaces:status,interfaces:read,interfaces:restart,logfiles:status,logfiles:view,logfiles:download,logfiles:tail,modules:status,syslog:status,syslog:loginfo,syslog:startstop,rc:status,hostname:edit,interfaces:delete,interfaces:create,interfaces:update,interfaces:ifup,interfaces:ifdown,logfiles:delete,syslog:config,rc:edit,syslog:expert,interfaces:editintfile,modules:edit,modules:reload,password:edit
diff --git a/health-controller.lua b/health-controller.lua
index ef08301..3b2bbf1 100644
--- a/health-controller.lua
+++ b/health-controller.lua
@@ -16,10 +16,6 @@ network = function (self )
 	return self.model:get_network()
 end
 
-modules = function (self )
-	return self.model:get_modules()
-end
-
 proc = function (self )
 	return self.model:get_proc()
 end
diff --git a/health-model.lua b/health-model.lua
index 1bc8376..fb284bb 100644
--- a/health-model.lua
+++ b/health-model.lua
@@ -118,12 +118,6 @@ get_network = function (self)
 	return cfe({ type="group", value=network })
 end
 
-get_modules = function (self)
-	local modules = {}
-	modules.list = cfe({ value=querycmd("lsmod"), label="Modules List" })
-	return cfe({ type="group", value=modules })
-end
-
 get_proc = function (self)
 	local proc = {}
 	proc.processor = cfe({ value=fs.read_file("/proc/cpuinfo") or "", label="Processor" })
diff --git a/health-modules-html.lsp b/health-modules-html.lsp
deleted file mode 100644
index 0cd760b..0000000
--- a/health-modules-html.lsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<% local view = ... %>
-
-<h1>Modules</h1>
-
-<h2>Installed modules</h2>
-<DL>
-<pre><%= html.html_escape(view.value.list.value) %></pre>
-</DL>
diff --git a/health.menu b/health.menu
index 3ccde17..5a6314e 100644
--- a/health.menu
+++ b/health.menu
@@ -4,4 +4,3 @@ System		01General_health	Hardware		proc
 System		01General_health	Storage			storage
 System		01General_health	Network			network
 System		01General_health	Network_Activity	networkstats
-System		01General_health	Modules			modules
-- 
cgit v1.2.3