X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdbmaster.pp;h=594f8dbbd7cdeaa47d07991c5299c6d857e430a2;hb=3b8f6afb92c2ca70911fe3dc67c9a23001ff99de;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..594f8dbbd 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',
+	       source => 'puppet:///modules/ssl/from-letsencrypt/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,
+	}
 }