X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdbmaster.pp;h=5dbc7b62d489d6357c017247e5b684deeb697787;hb=e72ca7f872082978dd038870b11918ba2237dc40;hp=5a962096b645cfaee7ad8951fb35ad12d7e29432;hpb=022adef6d30cad4e24b596ec9d89c189f7426245;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp
index 5a962096b..5dbc7b62d 100644
--- a/modules/roles/manifests/dbmaster.pp
+++ b/modules/roles/manifests/dbmaster.pp
@@ -8,12 +8,23 @@
 #
 class roles::dbmaster {
 
-	include roles::pubsub::params
+	include roles::pubsub::parameters
 
-	$rabbit_password = $roles::pubsub::params::rabbit_password
+	$rabbit_password = $roles::pubsub::parameters::rabbit_password
 
 	ssl::service { 'db.debian.org':
-		notify => Service['apache2'],
+		notify  => [ Exec['service apache2 reload'],
+		             Service['slapd'] ],
+		key => true,
+		tlsaport => [443, 389, 636],
+	}
+
+	file { "/etc/ldap/db.debian.org.key":
+	       ensure => present,
+	       mode   => '0440',
+	       group  => 'openldap',
+	       content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.letsencrypt_dir"]) + "/db.debian.org.key") %>'),
+	       links  => follow,
 	}
 
 	roles::pubsub::config { 'generate':
@@ -24,4 +35,8 @@ class roles::dbmaster {
 		username => $::fqdn,
 		password => $rabbit_password
 	}
+
+	service { 'slapd':
+		ensure => running,
+	}
 }