Cleanup and simplification

diff --git a/manifests/config.pp b/manifests/config.pp
index 3d1664b075d2b93ac941251b0458499dc95407b0..147a4bad8bf70de6111fa03876738ad6d9cb4b49 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,64 +1,17 @@
 class logcheck::config ($reportlevel) {
   file {
-#    '/etc/logcheck/logcheck.conf':
-#      ensure            => present,
-#      content           => template("logcheck/etc/logcheck/logcheck.conf.${::fqdn}"),
-#    ;
-
     '/etc/logcheck/ignore.d.server/':
       ensure  => directory,
       source  => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.server/',
       recurse => remote,
       replace => true,
-#      group             => 'logcheck',
-#      mode              => '2750',
     ;
-
     '/etc/logcheck/ignore.d.workstation/':
       ensure  => directory,
       source  => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.workstation/',
       recurse => remote,
       replace => true,
-#      group             => 'logcheck',
-#      mode              => '2750',
     ;
-
-#    '/etc/logcheck/ignore.d.workstation/local-wpasupplicant':
-#      ensure            => present,
-#      source            => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.workstation/local-wpasupplicant',
-#      group             => 'logcheck',
-#    ;
-#
-#    '/etc/logcheck/ignore.d.workstation/local-dbus':
-#      ensure            => present,
-#      source            => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.workstation/local-dbus',
-#      group             => 'logcheck',
-#    ;
-#
-#    '/etc/logcheck/ignore.d.workstation/local-kde':
-#      ensure            => present,
-#      source            => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.workstation/local-kde',
-#      group             => 'logcheck',
-#    ;
-#
-#    '/etc/logcheck/ignore.d.workstation/local-networkmanager':
-#      ensure            => present,
-#      source            => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.workstation/local-networkmanager',
-#      group             => 'logcheck',
-#    ;
-#    '/etc/logcheck/ignore.d.workstation/local-dhcpcd':
-#      ensure            => absent,
-#    ;
-#    '/etc/logcheck/ignore.d.server/local-sympa':
-#      ensure            => present,
-#      source            => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.server/local-sympa',
-#      group             => 'logcheck',
-#    ;
-#    '/etc/logcheck/ignore.d.server/local-dhcpcd':
-#      ensure            => present,
-#      source            => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.server/local-dhcpcd',
-#      group             => 'logcheck',
-#    ;
   }
 }
 

diff --git a/manifests/init.pp b/manifests/init.pp
index be2382291e4cf67479656d2f652ae05c7d973dd1..1a03ca096cd459b1bc3e436b3aac3ab04987fffb 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,9 +1,10 @@
-class logcheck ($reportlevel = lookup('logcheck_reportlevel', undef, undef, server)) {
+class logcheck (
+  $reportlevel = lookup('logcheck_reportlevel', undef, undef, server)
+) {
   class {
-    "::${name}::install":                 ;
+    "::${name}::install": ;
     "::${name}::config":
-      reportlevel             => $reportlevel,
+      reportlevel => $reportlevel,
     ;
   }
 }
-