From aaef3588d530d014e260aa95093ca154ed30c06f Mon Sep 17 00:00:00 2001 From: Hendrik Jaeger Date: Sat, 20 Feb 2021 20:27:51 +0100 Subject: [PATCH] Cleanup and simplification --- manifests/config.pp | 47 --------------------------------------------- manifests/init.pp | 9 +++++---- 2 files changed, 5 insertions(+), 51 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 3d1664b..147a4ba 100644 --- 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 be23822..1a03ca0 100644 --- 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, ; } } - -- 2.39.2