whitespace cleanup

[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 fcef2e89a3c508c29a0c297d2f0e1b114c76dca7..ff5d0fe027dbc057284cf6d4b098b0edc1b63f12 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -15,7 +15,8 @@ class debian-org {
                'debian-admin@ftbfs.de',
                'weasel@debian.org',
                'steve@lobefin.net',
-               'paravoid@debian.org'
+               'paravoid@debian.org',
+               'zumbi@kos.to'
        ]
 
        package { [
@@ -107,8 +108,8 @@ class debian-org {
        }
        site::aptrepo { 'backports.org':
                ensure => absent,
-               keyid => '16BA136C',
-               key => 'puppet:///modules/debian-org/backports.org.asc',
+               keyid  => '16BA136C',
+               key    => 'puppet:///modules/debian-org/backports.org.asc',
        }
 
        site::aptrepo { 'volatile':
@@ -117,6 +118,14 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
+       if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem] {
+               site::aptrepo { 'proposed-updates':
+                       url        => $mirror,
+                       suite      => "${::lsbdistcodename}-proposed-updates",
+                       components => ['main','contrib','non-free']
+               }
+       }
+
        site::aptrepo { 'debian.org':
                ensure => absent,
        }
@@ -180,12 +189,12 @@ class debian-org {
                source => 'puppet:///modules/debian-org/puppet.default',
        }
        file { '/etc/cron.d/dsa-puppet-stuff':
-               source => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
+               source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
                require => Package['debian.org'],
        }
        file { '/etc/ldap/ldap.conf':
                require => Package['debian.org'],
-               source => 'puppet:///modules/debian-org/ldap.conf',
+               source  => 'puppet:///modules/debian-org/ldap.conf',
        }
        file { '/etc/pam.d/common-session':
                require => Package['debian.org'],
@@ -216,8 +225,11 @@ class debian-org {
        # 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',
+               ensure => absent
+       }
+       site::sysctl { 'perf_event_paranoid':
+               key   => 'kernel.perf_event_paranoid',
+               value => '2',
        }
        site::alternative { 'editor':
                linkto => '/usr/bin/vim.basic',
@@ -226,9 +238,9 @@ class debian-org {
                linkto => '/usr/bin/vim.basic',
        }
        mailalias { 'samhain-reports':
-               ensure => present,
+               ensure    => present,
                recipient => $debianadmin,
-               require => Package['debian.org']
+               require   => Package['debian.org']
        }
 
        exec { 'apt-get update':
@@ -252,4 +264,12 @@ class debian-org {
        exec { 'init q':
                refreshonly => true
        }
+
+       tidy { '/var/lib/puppet/clientbucket/':
+               age      => '2w',
+               recurse  => 9,
+               type     => ctime,
+               matches  => [ 'paths', 'contents' ],
+               schedule => weekly
+       }
 }