Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[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 1c42d5f59cea63ca311f16501b66ed7b19ce94bc..fcef2e89a3c508c29a0c297d2f0e1b114c76dca7 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,4 +1,14 @@
 class debian-org {
+       if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
+               $mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
+       } else {
+               $mirror = 'http://http.debian.net/debian/'
+       }
+       if $::lsbmajdistrelease < 7 {
+               $mirror_backports = 'http://backports.debian.org/debian-backports/'
+       } else {
+               $mirror_backports = $mirror
+       }
 
        $debianadmin = [
                'debian-archive-debian-samhain-reports@master.debian.org',
@@ -38,7 +48,7 @@ class debian-org {
        }
 
        if $::lsbmajdistrelease >= 7 {
-               package { 'libfilesystem-ruby1.9':
+               package { 'libfilesystem-ruby1.9.1':
                        ensure => installed,
                }
        }
@@ -90,26 +100,10 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
-       if $::lsbdistcodename != 'wheezy' {
-               site::aptrepo { 'backports.debian.org':
-                       url        => 'http://backports.debian.org/debian-backports/',
-                       suite      => "${::lsbdistcodename}-backports",
-                       components => ['main','contrib','non-free']
-               }
-
-               if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
-                       site::aptrepo { 'volatile':
-                               url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
-                               suite      => "${::lsbdistcodename}-updates",
-                               components => ['main','contrib','non-free']
-                       }
-               } else {
-                       site::aptrepo { 'volatile':
-                               url        => 'http://ftp.debian.org/debian',
-                               suite      => "${::lsbdistcodename}-updates",
-                               components => ['main','contrib','non-free']
-                       }
-               }
+       site::aptrepo { 'backports.debian.org':
+               url        => $mirror_backports,
+               suite      => "${::lsbdistcodename}-backports",
+               components => ['main','contrib','non-free']
        }
        site::aptrepo { 'backports.org':
                ensure => absent,
@@ -117,6 +111,12 @@ class debian-org {
                key => 'puppet:///modules/debian-org/backports.org.asc',
        }
 
+       site::aptrepo { 'volatile':
+               url        => $mirror,
+               suite      => "${::lsbdistcodename}-updates",
+               components => ['main','contrib','non-free']
+       }
+
        site::aptrepo { 'debian.org':
                ensure => absent,
        }
@@ -208,6 +208,10 @@ 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