quiet you

[dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 30998c35b35bf4928a1ebcf19a4c418156f57bd4..554c083489db78958e58c607ad6ddb0cf49bf482 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -8,13 +8,19 @@ class debian-org {
                'paravoid@debian.org'
        ]
 
+       package { [
+                       'klogd',
+                       'sysklogd',
+                       'rsyslog',
+               ]:
+                       ensure => purged,
+       }
        package { [
                        'apt-utils',
                        'bash-completion',
                        'debian.org',
                        'dnsutils',
                        'dsa-munin-plugins',
-                       'klogd',
                        'less',
                        'lsb-release',
                        'libfilesystem-ruby1.8',
@@ -22,8 +28,6 @@ class debian-org {
                        'mtr-tiny',
                        'nload',
                        'pciutils',
-                       'rsyslog',
-                       'sysklogd',
                ]:
                        ensure => installed,
        }
@@ -131,8 +135,8 @@ class debian-org {
                require => Package['debian.org']
        }
 
-  # set mmap_min_addr to 4096 to mitigate
-  # Linux NULL-pointer dereference exploits
+       # set mmap_min_addr to 4096 to mitigate
+       # Linux NULL-pointer dereference exploits
        site::sysctl { 'mmap_min_addr':
                key   => 'vm.mmap_min_addr',
                value => '4096',