X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdbmaster.pp;h=e78167a756e7db3500b0b55f8c00f15af249356b;hb=5798c1ac4a2c2bd8737087b515d0eb4869482576;hp=1bd9d2b06e813a0ed0535cf82ea5fe7b01ae75fc;hpb=9e6cd900f2c968f815d830633e90d3befdd7cc5f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp
index 1bd9d2b06..e78167a75 100644
--- a/modules/roles/manifests/dbmaster.pp
+++ b/modules/roles/manifests/dbmaster.pp
@@ -7,24 +7,25 @@
 #   include roles::dbmaster
 #
 class roles::dbmaster {
+  include apache2
 
   include roles::pubsub::parameters
 
   $rabbit_password = $roles::pubsub::parameters::rabbit_password
 
   ssl::service { 'db.debian.org':
-    notify  => [ Exec['service apache2 reload'],
-                 Service['slapd'] ],
-    key => true,
+    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',
+  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,
+    links   => follow,
   }
 
   roles::pubsub::config { 'generate':
@@ -47,4 +48,16 @@ class roles::dbmaster {
     key         => $facts['dsa_key'],
     collect_tag => 'puppetmaster',
   }
+
+  exim::vdomain { 'db.debian.org':
+    mail_user  => 'mail_db',
+    mail_group => 'nogroup',
+  }
+
+  ferm::rule::simple { 'finger':
+    port => 'finger',
+  }
+  ferm::rule::simple { 'ldap':
+    port => ['ldap', 'ldaps'],
+  }
 }