diff options
| -rw-r--r-- | manifests/config.pp | 17 | ||||
| -rw-r--r-- | manifests/init.pp | 23 | ||||
| -rw-r--r-- | manifests/install.pp | 8 |
3 files changed, 18 insertions, 30 deletions
diff --git a/manifests/config.pp b/manifests/config.pp deleted file mode 100644 index 147a4ba..0000000 --- a/manifests/config.pp +++ /dev/null @@ -1,17 +0,0 @@ -class logcheck::config ($reportlevel) { - file { - '/etc/logcheck/ignore.d.server/': - ensure => directory, - source => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.server/', - recurse => remote, - replace => true, - ; - '/etc/logcheck/ignore.d.workstation/': - ensure => directory, - source => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.workstation/', - recurse => remote, - replace => true, - ; - } -} - diff --git a/manifests/init.pp b/manifests/init.pp index 1a03ca0..5000faf 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,10 +1,23 @@ class logcheck ( - $reportlevel = lookup('logcheck_reportlevel', undef, undef, server) + String $reportlevel = 'server' ) { - class { - "::${name}::install": ; - "::${name}::config": - reportlevel => $reportlevel, + package { + ['logcheck','logcheck-database']: + ensure => installed, + ; + } + file { + '/etc/logcheck/ignore.d.server/': + ensure => directory, + source => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.server/', + recurse => remote, + replace => true, + ; + '/etc/logcheck/ignore.d.workstation/': + ensure => directory, + source => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.workstation/', + recurse => remote, + replace => true, ; } } diff --git a/manifests/install.pp b/manifests/install.pp deleted file mode 100644 index 03367b1..0000000 --- a/manifests/install.pp +++ /dev/null @@ -1,8 +0,0 @@ -class logcheck::install { - package { - ['logcheck','logcheck-database']: - ensure => installed, - ; - } -} - |