Try to work if $::hoster is not yet defined

[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 9f6f3b3d6658d65a1c46688a2d02a3b1548a1941..81373f75f25a4069ddb6f0ce94937d3626573d65 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -27,6 +27,7 @@ class debian-org {
                        'klogd',
                        'sysklogd',
                        'rsyslog',
+                       'os-prober',
                ]:
                ensure => purged,
        }
@@ -120,7 +121,7 @@ class debian-org {
                        suite      => "${::lsbdistcodename}-lts",
                        components => ['main','contrib','non-free']
                }
-       else
+       } else {
                site::aptrepo { 'debian-lts':
                        ensure => absent,
                }
@@ -138,12 +139,17 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
-       if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem] {
+       if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson]) or
+          ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
                site::aptrepo { 'proposed-updates':
                        url        => $mirror,
                        suite      => "${::lsbdistcodename}-proposed-updates",
                        components => ['main','contrib','non-free']
                }
+       } else {
+               site::aptrepo { 'proposed-updates':
+                       ensure => absent,
+               }
        }
 
        site::aptrepo { 'debian.org':
@@ -306,4 +312,17 @@ class debian-org {
                matches  => [ 'paths', 'contents' ],
                schedule => weekly
        }
+
+       file { '/root/.bashrc':
+               source => 'puppet:///modules/debian-org/root-dotfiles/bashrc',
+       }
+       file { '/root/.profile':
+               source => 'puppet:///modules/debian-org/root-dotfiles/profile',
+       }
+       file { '/root/.screenrc':
+               source => 'puppet:///modules/debian-org/root-dotfiles/screenrc',
+       }
+       file { '/root/.vimrc':
+               source => 'puppet:///modules/debian-org/root-dotfiles/vimrc',
+       }
 }