Nothing cares about the $dbpassword variable we set on handel. Remove it

[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 6bb70c5..6e0ea31 100644 (file)
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -53,6 +53,7 @@ class debian_org {
                        'nload',
                        'pciutils',
                        'lldpd',
+                       'ncurses-term',
                ]:
                ensure => installed,
        }
@@ -131,10 +132,6 @@ class debian_org {
                        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'),
                mode => '0440',
@@ -217,7 +214,7 @@ class debian_org {
                require => Package['debian.org']
        }
        file { '/etc/nsswitch.conf':
-               mode   => '0755',
+               mode   => '0444',
                source => 'puppet:///modules/debian_org/nsswitch.conf',
        }
 
@@ -370,4 +367,10 @@ class debian_org {
                refreshonly => true,
                require => Package['userdir-ldap']
        }
+
+       # some changes require rebuilding the initramfs.  Have the common exec here.
+       exec { 'update-initramfs -u':
+               path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+               refreshonly => true;
+       }
 }