X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=a12ce2d91d7c76f34b5726d9c983d4f14bb1d0c9;hb=f0dbf198d87cdfdca07aece29f03732383144e43;hp=5258dfbe6b54aa6e365806d432a77886d6405a77;hpb=2eaab21ba472e71a1ed50a45eec4a4bff7e48baa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 5258dfbe6..a12ce2d91 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -154,6 +154,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'),
 	}