]> git.donarmstrong.com Git - dsa-puppet.git/blobdiff - modules/debian-org/manifests/init.pp
Fix up syntax error typo
[dsa-puppet.git] / modules / debian-org / manifests / init.pp
index 9feb912f55739fe86812e8a7d0554cb8bb5e9b26..bcfff1c6f87a90f90ca54ebd982c080f02e2d1b1 100644 (file)
@@ -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 { [
@@ -101,7 +102,7 @@ class debian-org {
        }
 
        site::aptrepo { 'backports.debian.org':
-               url        => $mirror_backports
+               url        => $mirror_backports,
                suite      => "${::lsbdistcodename}-backports",
                components => ['main','contrib','non-free']
        }
@@ -208,12 +209,19 @@ class debian-org {
                source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron.ignore',
                require => Package['debian.org']
        }
+       file { '/etc/nsswitch.conf':
+               mode   => '0755',
+               source => 'puppet:///modules/debian-org/nsswitch.conf',
+       }
 
        # 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',