Allow setting main debian mirror via puppet

[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 5258dfbe6b54aa6e365806d432a77886d6405a77..04db264f5a5528a0fe26d7bc39b9a2ec64077d03 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -98,10 +98,18 @@ class debian-org {
                        components => ['main','contrib','non-free']
                }
 
-               site::aptrepo { 'volatile':
-                       url        => 'http://ftp.debian.org/debian',
-                       suite      => "${::lsbdistcodename}-updates",
-                       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.org':
@@ -121,6 +129,14 @@ class debian-org {
                key        => 'puppet:///modules/debian-org/db.debian.org.asc',
        }
 
+       if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
+               site::aptrepo { 'debian':
+                       url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
+                       suite      => "${::lsbdistcodename}",
+                       components => ['main','contrib','non-free']
+               }
+       }
+
        file { '/etc/facter':
                ensure  => directory,
                purge   => true,
@@ -154,6 +170,10 @@ class debian-org {
                source => 'puppet:///modules/debian-org/timezone',
                notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
        }
+       if $::hostname == handel {
+               include puppetmaster::db
+               $dbpassword = $puppetmaster::db::password
+       }
        file { '/etc/puppet/puppet.conf':
                content => template('debian-org/puppet.conf.erb'),
        }