cfengine: Comment out all logcheck code - breaks with post-woody logcheck.

1 files changed, 41 insertions, 41 deletions

diff --git a/cfengine/cf.services.harden b/cfengine/cf.services.harden
index ba25982..9402860 100644
--- a/cfengine/cf.services.harden
+++ b/cfengine/cf.services.harden
@@ -56,8 +56,6 @@ editfiles:
 		EndGroup
 	}
 	## logcheck section
-	#{ /etc/aide/aide.conf
-	#}
 	{ /etc/integrit/integrit.conf
 		#
 		# Uncomment suggested defaults
@@ -103,46 +101,48 @@ editfiles:
 		UnCommentLinesMatching "    # ! fi"
 	}
 
-copy:
-	#The linktype is necessary for links to be replaced with files.
-	NameServer::
-		$(LocalCommon)/logcheck/ignore.d.$(type)/bind dest=$(logcheck)/ignore.d/local-bind linktype=copy
-		$(LocalCommon)/logcheck/violations.ignore.d/bind dest=$(logcheck)/violations.ignore.d/local-bind linktype=copy
-
-	FileServer::
-		$(LocalCommon)/logcheck/ignore.d.$(type)/samba dest=$(logcheck)/ignore.d/local-samba linktype=copy
-		$(LocalCommon)/logcheck/ignore.d.$(type)/netatalk dest=$(logcheck)/ignore.d/local-netatalk linktype=copy
-		$(LocalCommon)/logcheck/violations.ignore.d/samba dest=$(logcheck)/violations.ignore.d/local-samba linktype=copy
-
-	DHCPServer::
-		$(LocalCommon)/logcheck/ignore.d.$(type)/dhcp dest=$(logcheck)/ignore.d/local-dhcp linktype=copy
-		$(LocalCommon)/logcheck/ignore.d.$(type)/dhcp3-common dest=$(logcheck)/ignore.d/local-dhcp3-common linktype=copy
-
-	WWWServer::
-
-	FTPServer::
-		$(LocalCommon)/logcheck/ignore.d.$(type)/proftpd dest=$(logcheck)/ignore.d/local-proftpd linktype=copy
-		$(LocalCommon)/logcheck/violations.ignore.d/proftpd dest=$(logcheck)/violations.ignore.d/local-proftpd linktype=copy
-
-	IMAPServer::
-		$(LocalCommon)/logcheck/ignore.d.$(type)/uw-imap dest=$(logcheck)/ignore.d/local-uw-imap linktype=copy
-
-	SpamAssServer::
-		$(LocalCommon)/logcheck/ignore.d.$(type)/spamassassin dest=$(logcheck)/ignore.d/local-spamassassin linktype=copy
-
-	runs_postfix::
-		$(LocalCommon)/logcheck/ignore.d.$(type)/postfix dest=$(logcheck)/ignore.d/local-postfix linktype=copy
-		$(LocalCommon)/logcheck/violations.ignore.d/postfix dest=$(logcheck)/violations.ignore.d/local-postfix linktype=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:
+#	## 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.
+#	NameServer::
+#		$(LocalCommon)/logcheck/ignore.d.$(type)/bind dest=$(logcheck)/ignore.d/local-bind linktype=copy
+#		$(LocalCommon)/logcheck/violations.ignore.d/bind dest=$(logcheck)/violations.ignore.d/local-bind linktype=copy
+#
+#	FileServer::
+#		$(LocalCommon)/logcheck/ignore.d.$(type)/samba dest=$(logcheck)/ignore.d/local-samba linktype=copy
+#		$(LocalCommon)/logcheck/ignore.d.$(type)/netatalk dest=$(logcheck)/ignore.d/local-netatalk linktype=copy
+#		$(LocalCommon)/logcheck/violations.ignore.d/samba dest=$(logcheck)/violations.ignore.d/local-samba linktype=copy
+#
+#	DHCPServer::
+#		$(LocalCommon)/logcheck/ignore.d.$(type)/dhcp dest=$(logcheck)/ignore.d/local-dhcp linktype=copy
+#		$(LocalCommon)/logcheck/ignore.d.$(type)/dhcp3-common dest=$(logcheck)/ignore.d/local-dhcp3-common linktype=copy
+#
+#	WWWServer::
+#
+#	FTPServer::
+#		$(LocalCommon)/logcheck/ignore.d.$(type)/proftpd dest=$(logcheck)/ignore.d/local-proftpd linktype=copy
+#		$(LocalCommon)/logcheck/violations.ignore.d/proftpd dest=$(logcheck)/violations.ignore.d/local-proftpd linktype=copy
+#
+#	IMAPServer::
+#		$(LocalCommon)/logcheck/ignore.d.$(type)/uw-imap dest=$(logcheck)/ignore.d/local-uw-imap linktype=copy
+#
+#	SpamAssServer::
+#		$(LocalCommon)/logcheck/ignore.d.$(type)/spamassassin dest=$(logcheck)/ignore.d/local-spamassassin linktype=copy
+#
+#	runs_postfix::
+#		$(LocalCommon)/logcheck/ignore.d.$(type)/postfix dest=$(logcheck)/ignore.d/local-postfix linktype=copy
+#		$(LocalCommon)/logcheck/violations.ignore.d/postfix dest=$(logcheck)/violations.ignore.d/local-postfix linktype=copy
+#
 #	any::
-#		# Set logcheck machine type (workstation or server)
-#		$(logcheck)/ignore.d ->! $(logcheck)/ignore.d.$(type)
-#		$(logcheck)/logcheck.ignore ->! $(logcheck)/logcheck.ignore.$(type)
+#		$(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::