add debussy

[mirror/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 a7ff786..30f0be5 100644 (file)
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -12,13 +12,15 @@ class debian_org {
                $servicefiles = 'absent'
        }
 
-       $debianadmin = [
-               'debian-archive-debian-samhain-reports@master.debian.org',
-               'debian-admin@ftbfs.de',
-               'weasel@debian.org',
-               'steve@lobefin.net',
-               'zumbi@oron.es'
-       ]
+       # the virtual facter needs virt-what on jessie to work
+       if versioncmp($::lsbmajdistrelease, '9') < 0 {
+               package { 'virt-what': ensure => installed }
+       } else {
+               package { 'virt-what': ensure => purged }
+       }
+
+       $samhain_recipients = hiera('samhain_recipients')
+       $root_mail_alias = hiera('root_mail_alias')
 
        package { [
                        'klogd',
@@ -26,12 +28,15 @@ class debian_org {
                        'rsyslog',
                        'os-prober',
                        'apt-listchanges',
+                       'mlocate',
                ]:
                ensure => purged,
        }
        package { [
                        'debian.org',
+                       'debian.org-recommended',
                        'dsa-munin-plugins',
+                       'userdir-ldap',
                ]:
                ensure => installed,
                tag    => extra_repo,
@@ -218,6 +223,14 @@ class debian_org {
                mode   => '0444',
                source => 'puppet:///modules/debian_org/etc.zsh/zprofile',
        }
+       file { '/etc/environment':
+               content => "",
+               mode => '0440',
+       }
+       file { '/etc/default/locale':
+               content => "",
+               mode => '0440',
+       }
 
        # set mmap_min_addr to 4096 to mitigate
        # Linux NULL-pointer dereference exploits
@@ -240,7 +253,12 @@ class debian_org {
        }
        mailalias { 'samhain-reports':
                ensure    => present,
-               recipient => $debianadmin,
+               recipient => $samhain_recipients,
+               require   => Package['debian.org']
+       }
+       mailalias { 'root':
+               ensure    => present,
+               recipient => $root_mail_alias,
                require   => Package['debian.org']
        }
 
@@ -250,6 +268,10 @@ class debian_org {
                owner  => root,
                group  => root,
        }
+       file { '/usr/local/bin/dsa-is-shutdown-scheduled':
+               source  => 'puppet:///modules/debian_org/dsa-is-shutdown-scheduled',
+               mode    => '0555',
+       }
 
        exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
@@ -301,4 +323,10 @@ class debian_org {
        file { '/root/.vimrc':
                source => 'puppet:///modules/debian_org/root-dotfiles/vimrc',
        }
+
+       if versioncmp($::lsbmajdistrelease, '9') >= 0 { # older puppets do facts as strings.
+               if $::processorcount > 1 {
+                       package { 'irqbalance': ensure => installed }
+               }
+       }
 }