Deploy initial ssh_known_hosts using 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 a6270d8b3d20368a6b149c389cd06fb28db6a7d7..bc965ae8a639a8cba74b286aeb9526dd9d4d178f 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,
        }
@@ -37,6 +38,12 @@ class debian-org {
                ensure => installed,
                tag    => extra_repo,
        }
+       file { '/etc/ssh/ssh_known_hosts':
+               ensure  => present,
+               replace => false,
+               mode    => '0644',
+               source  => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
+       }
 
        package { [
                        'apt-utils',
@@ -138,12 +145,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':
@@ -310,6 +322,9 @@ class debian-org {
        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',
        }