X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fdbmaster.pp;h=5dbc7b62d489d6357c017247e5b684deeb697787;hb=d63068dc7d8ace2d3fc0b6076b97b798b24e2b08;hp=334857fec42fdb5fb12183155caf7fb612fe3081;hpb=1f1aa0ea7fee69c0fa68cd1150e5ccbbe25f1ead;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp
index 334857fec..5dbc7b62d 100644
--- a/modules/roles/manifests/dbmaster.pp
+++ b/modules/roles/manifests/dbmaster.pp
@@ -13,7 +13,8 @@ class roles::dbmaster {
 	$rabbit_password = $roles::pubsub::parameters::rabbit_password
 
 	ssl::service { 'db.debian.org':
-		notify  => Exec['service apache2 reload'],
+		notify  => [ Exec['service apache2 reload'],
+		             Service['slapd'] ],
 		key => true,
 		tlsaport => [443, 389, 636],
 	}
@@ -22,7 +23,7 @@ class roles::dbmaster {
 	       ensure => present,
 	       mode   => '0440',
 	       group  => 'openldap',
-	       source => 'puppet:///modules/ssl/from-letsencrypt/db.debian.org.key',
+	       content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.letsencrypt_dir"]) + "/db.debian.org.key") %>'),
 	       links  => follow,
 	}
 
@@ -34,4 +35,8 @@ class roles::dbmaster {
 		username => $::fqdn,
 		password => $rabbit_password
 	}
+
+	service { 'slapd':
+		ensure => running,
+	}
 }