Add zprofile

[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 c7e0db0..90291be 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -34,8 +34,7 @@ class debian-org {
                'debian-admin@ftbfs.de',
                'weasel@debian.org',
                'steve@lobefin.net',
-               'paravoid@debian.org',
-               'zumbi@kos.to'
+               'zumbi@oron.es'
        ]
 
        package { [
@@ -131,10 +130,16 @@ class debian-org {
                content => "",
        }
 
-       site::aptrepo { 'security':
-               url        => 'http://security-cdn.debian.org/',
-               suite      => "${mungedcodename}/updates",
-               components => ['main','contrib','non-free']
+       if ($::lsbmajdistrelease >= 8) {
+               site::aptrepo { 'security':
+                       url        => 'http://security-cdn.debian.org/',
+                       suite      => "${mungedcodename}/updates",
+                       components => ['main','contrib','non-free']
+               }
+       } else {
+               site::aptrepo { 'security':
+                       ensure => absent,
+               }
        }
        site::aptrepo { 'debian-lts':
                ensure => absent,
@@ -198,7 +203,11 @@ class debian-org {
                }
        }
        site::aptrepo { 'debian-cdn':
-               url        => "http://cdn-fastly.deb.debian.org/debian"
+               ensure => absent,
+       }
+
+       site::aptrepo { 'debian2':
+               url        => "http://cdn-fastly.deb.debian.org/debian",
                suite      => $mungedcodename,
                components => ['main','contrib','non-free']
        }
@@ -302,6 +311,18 @@ class debian-org {
                source => 'puppet:///modules/debian-org/nsswitch.conf',
        }
 
+       file { '/etc/profile.d/timeout.sh':
+               mode   => '0555',
+               source => 'puppet:///modules/debian-org/etc.profile.d/timeout.sh',
+       }
+       file { '/etc/zsh':
+               ensure => directory,
+       }
+       file { '/etc/zsh/zprofile':
+               mode   => '0444',
+               source => 'puppet:///modules/debian-org/etc.zsh/zprofile',
+       }
+
        # set mmap_min_addr to 4096 to mitigate
        # Linux NULL-pointer dereference exploits
        site::sysctl { 'mmap_min_addr':