Revert "Restrict ssh to anycast and static mirrors"

[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 af8f8bb..30f0be5 100644 (file)
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -20,6 +20,7 @@ class debian_org {
        }
 
        $samhain_recipients = hiera('samhain_recipients')
+       $root_mail_alias = hiera('root_mail_alias')
 
        package { [
                        'klogd',
@@ -222,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
@@ -247,6 +256,11 @@ class debian_org {
                recipient => $samhain_recipients,
                require   => Package['debian.org']
        }
+       mailalias { 'root':
+               ensure    => present,
+               recipient => $root_mail_alias,
+               require   => Package['debian.org']
+       }
 
        file { '/usr/local/bin/check_for_updates':
                source => 'puppet:///modules/debian_org/check_for_updates',