From b305554cc566f41cb4e3b707ff9e3fa41cea3533 Mon Sep 17 00:00:00 2001 From: Jeff Bilyk Date: Sat, 1 Oct 2011 15:23:23 +0000 Subject: Fix typos and correct paths to config and log files --- Makefile | 2 +- lighttpd-controller.lua | 5 +---- lighttpd-model.lua | 17 ++++++----------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index bfd7f9a..e67af58 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ PACKAGE=acf-$(APP_NAME) VERSION=0.3.0 APP_DIST=\ - lightpd* \ + lighttpd* \ EXTRA_DIST=README Makefile config.mk diff --git a/lighttpd-controller.lua b/lighttpd-controller.lua index 72da42e..f664b57 100644 --- a/lighttpd-controller.lua +++ b/lighttpd-controller.lua @@ -22,10 +22,7 @@ function listfiles(self) end function expert(self) - return controllerfunctions.handle_form(self, function() return -self.model.getfiledetails(self.clientdata.filename) end, -self.model.updatefiledetails, self.clientdata, "Save", "Edit Lighttpd -File", "File Saved") + return controllerfunctions.handle_form(self, function() return self.model.getfiledetails(self.clientdata.filename) end, self.model.updatefiledetails, self.clientdata, "Save", "Edit ClamAV File", "File Saved") end function logfile(self) diff --git a/lighttpd-model.lua b/lighttpd-model.lua index 53c8310..b8c08e5 100644 --- a/lighttpd-model.lua +++ b/lighttpd-model.lua @@ -8,8 +8,7 @@ require("format") -- Set variables local processname = "lighttpd" local packagename = "lighttpd" -local filelist = {"/etc/lighttpd/lightpd.conf", -"/etc/lighttpd/mod_cgi.conf"} +local filelist = {"/etc/lighttpd/lighttpd.conf", "/etc/lighttpd/mod_cgi.conf", "/etc/lighttpd/mod_fastcgi.conf", "/etc/lighttpd/mod_fastcgi_fpm.conf"} local path = "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin " @@ -24,13 +23,11 @@ function startstop_service(action) end function getstatus() - return modelfunctions.getstatus(processname, packagename, -"Lighttpd Status") + return modelfunctions.getstatus(processname, packagename, "Lighttpd Status") end function getstatusdetails() - return cfe({ type="longtext", value="", label="Lighttpd Status -Details" }) + return cfe({ type="longtext", value="", label="Lighttpd Status Details" }) end function getfilelist() @@ -43,8 +40,7 @@ function getfilelist() table.sort(listed_files, function (a,b) return (a.filename < b.filename) end ) - return cfe({ type="list", value=listed_files, label="Lighttpd -File List" }) + return cfe({ type="list", value=listed_files, label="Lighttpd File List" }) end function getfiledetails(filename) @@ -59,14 +55,13 @@ function getlogfile () local files = {} local logfilepath = format.parse_configfile(fs.read_file(filelist[1]) or "").LogFile if not logfilepath then - files[#files+1] = {path = -"/var/log/lighttpd/access.log"} + files[#files+1] = {path = "/var/log/lighttpd/access.log"} else files[#files+1] = {path=logfilepath} end logfilepath = format.parse_configfile(fs.read_file(filelist[2]) or "").UpdateLogFile if not logfilepath then - files[#files+1] = {path = "/var/log/eror.log"} + files[#files+1] = {path = "/var/log/lighttpd/error.log"} else files[#files+1] = {path=logfilepath} end -- cgit v1.2.3