summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2009-06-23 09:25:33 +0000
committerTed Trask <ttrask01@yahoo.com>2009-06-23 09:25:33 +0000
commit37a491f23a79bb0b4e743b730eb9527cec67719e (patch)
tree40adc3080e716e461e7d0c618ac8d42cea478dea
parent279bce119f118b66b4b4e2cd1ebf975a0873f848 (diff)
downloadacf-alpine-baselayout-37a491f23a79bb0b4e743b730eb9527cec67719e.tar.bz2
acf-alpine-baselayout-37a491f23a79bb0b4e743b730eb9527cec67719e.tar.xz
Fixed bug with syslog and cron status due to change to using openrc. Tagged 0.5.1v0.5.1
-rw-r--r--Makefile2
-rw-r--r--cron-model.lua7
-rw-r--r--syslog-model.lua7
3 files changed, 7 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 34df0cc..e0ce924 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
APP_NAME=alpine-baselayout
PACKAGE=acf-$(APP_NAME)
-VERSION=0.5.0
+VERSION=0.5.1
APP_DIST=\
alpine-baselayout.roles \
diff --git a/cron-model.lua b/cron-model.lua
index 40ec992..ad4ba1b 100644
--- a/cron-model.lua
+++ b/cron-model.lua
@@ -6,9 +6,8 @@ require("fs")
require("validator")
local configfile = "/etc/crontabs/root"
-local processname = "crond"
+local processname = "cron"
local packagename = "busybox"
-local servicename = "cron"
local baseurl = "/etc/periodic/"
local periods
@@ -50,11 +49,11 @@ end
-- PUBLIC FUNCTIONS
function startstop_service(action)
- return modelfunctions.startstop_service(servicename, action)
+ return modelfunctions.startstop_service(processname, action)
end
function getstatus()
- return modelfunctions.getstatus(processname, packagename, "Cron Status", servicename)
+ return modelfunctions.getstatus(processname, packagename, "Cron Status")
end
function listjobs()
diff --git a/syslog-model.lua b/syslog-model.lua
index ac6904f..4677336 100644
--- a/syslog-model.lua
+++ b/syslog-model.lua
@@ -6,9 +6,8 @@ require("format")
require("validator")
local configfile = "/etc/conf.d/syslog"
-local processinitname = "syslog"
local packagename = "busybox"
-local processname = "syslogd"
+local processname = "syslog"
local function getloglevels()
local loglevels = {}
@@ -147,11 +146,11 @@ end
-- PUBLIC FUNCTIONS
function startstop_service(action)
- return modelfunctions.startstop_service(processinitname, action)
+ return modelfunctions.startstop_service(processname, action)
end
function getstatus()
- return modelfunctions.getstatus(processname, packagename, "Syslog Status", processinitname)
+ return modelfunctions.getstatus(processname, packagename, "Syslog Status")
end
function getlogging()