set expires: headers on alioth-archive

[mirror/dsa-puppet.git] / modules / roles / manifests / dbmaster.pp

diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp
index 334857f..5dbc7b6 100644 (file)
--- 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,
+       }
 }