update zumbi email address

[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 6ac4c12..ad53e5c 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -13,11 +13,6 @@ class debian-org {
                        $mirror = 'http://deb.debian.org/debian/'
                }
        }
-       if $::lsbmajdistrelease < 7 {
-               $mirror_backports = 'http://backports.debian.org/debian-backports/'
-       } else {
-               $mirror_backports = $mirror
-       }
 
        if $::lsbmajdistrelease <= 7 {
                $mungedcodename = $::lsbdistcodename
@@ -40,7 +35,7 @@ class debian-org {
                'weasel@debian.org',
                'steve@lobefin.net',
                'paravoid@debian.org',
-               'zumbi@kos.to'
+               'zumbi@oron.es'
        ]
 
        package { [
@@ -68,10 +63,8 @@ class debian-org {
 
        if ($::lsbmajdistrelease >= 8) {
                $rubyfs_package = 'ruby-filesystem'
-       } elsif $::lsbmajdistrelease == 7  {
-               $rubyfs_package = 'libfilesystem-ruby1.9'
        } else {
-               $rubyfs_package = 'libfilesystem-ruby1.8'
+               $rubyfs_package = 'libfilesystem-ruby1.9'
        }
        package { [
                        'apt-utils',
@@ -138,25 +131,23 @@ class debian-org {
                content => "",
        }
 
-       site::aptrepo { 'security':
-               url        => 'http://security-cdn.debian.org/',
-               suite      => "${mungedcodename}/updates",
-               components => ['main','contrib','non-free']
-       }
-       if $::lsbmajdistrelease < 7 {
-               site::aptrepo { 'debian-lts':
-                       url        => $mirror,
-                       suite      => "${::lsbdistcodename}-lts",
+       if ($::lsbmajdistrelease >= 8) {
+               site::aptrepo { 'security':
+                       url        => 'http://security-cdn.debian.org/',
+                       suite      => "${mungedcodename}/updates",
                        components => ['main','contrib','non-free']
                }
        } else {
-               site::aptrepo { 'debian-lts':
+               site::aptrepo { 'security':
                        ensure => absent,
                }
        }
+       site::aptrepo { 'debian-lts':
+               ensure => absent,
+       }
 
        site::aptrepo { 'backports.debian.org':
-               url        => $mirror_backports,
+               url        => $mirror,
                suite      => "${::lsbdistcodename}-backports",
                components => ['main','contrib','non-free']
        }
@@ -212,6 +203,15 @@ class debian-org {
                        components => ['main','contrib','non-free']
                }
        }
+       site::aptrepo { 'debian-cdn':
+               ensure => absent,
+       }
+
+       site::aptrepo { 'debian2':
+               url        => "http://cdn-fastly.deb.debian.org/debian",
+               suite      => $mungedcodename,
+               components => ['main','contrib','non-free']
+       }
 
        file { '/etc/facter':
                ensure  => directory,