summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2003-07-28 11:49:15 +0000
committerJonas Smedegaard <dr@jones.dk>2003-07-28 11:49:15 +0000
commitec3fdd0948e123c32a23ca252e193dcf85b2edec (patch)
treea631c80342c28efc9d85164a42ebfad75d2c4668
parenta9bf7f1fce8640eb8f2d594d6158e0e224f47831 (diff)
Update to post-woody logcheck (on workstations the server rules are included, so always install both).
-rw-r--r--cfengine/cf.services.harden10
1 files changed, 2 insertions, 8 deletions
diff --git a/cfengine/cf.services.harden b/cfengine/cf.services.harden
index 590af5b..c8cf8ac 100644
--- a/cfengine/cf.services.harden
+++ b/cfengine/cf.services.harden
@@ -112,11 +112,11 @@ editfiles:
# }
## logcheck section
-# FIXME: Put all files into $(LocalCommon)/logcheck/ignore.d.$(type)/local to support post-woody logcheck
copy:
#The linktype is necessary for links to be replaced with files.
any::
- $(LocalCommon)/logcheck/ignore.d.$(type)/local dest=$(logcheck)/ignore.d.$(type)/local linktype=copy
+ $(LocalCommon)/logcheck/ignore.d.server/local dest=$(logcheck)/ignore.d.server/local linktype=copy
+ $(LocalCommon)/logcheck/ignore.d.workstation/local dest=$(logcheck)/ignore.d.workstation/local linktype=copy
$(LocalCommon)/logcheck/violations.ignore.d/local dest=$(logcheck)/violations.ignore.d/local linktype=copy
# NameServer::
# $(LocalCommon)/logcheck/ignore.d.$(type)/bind dest=$(logcheck)/ignore.d/local-bind linktype=copy
@@ -150,12 +150,6 @@ copy:
# any::
# $(LocalCommon)/logcheck/ignore.d.$(type)/ssh dest=$(logcheck)/ignore.d/local-ssh linktype=copy
# $(LocalCommon)/logcheck/violations.ignore.d/ssh dest=$(logcheck)/violations.ignore.d/local-ssh linktype=copy
-#
-##links:
-## any::
-## # Set logcheck machine type (workstation or server)
-## $(logcheck)/ignore.d ->! $(logcheck)/ignore.d.$(type)
-## $(logcheck)/logcheck.ignore ->! $(logcheck)/logcheck.ignore.$(type)
shellcommands:
install_logcheck::