X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdbmaster.pp;h=1a0fa9edc8c7175d504af21cffd78e102d1917bd;hb=71bb13421fb3746b67e2034be169dc3a6eff4a56;hp=a382a261ea1cfa66300df1703ea7f004b075cec7;hpb=7c4f42e17dcaae84bf72353069cbdf6f5272bae2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp
index a382a261e..1a0fa9edc 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':
@@ -39,4 +40,17 @@ class roles::dbmaster {
   service { 'slapd':
     ensure => running,
   }
+
+  ssh::keygen {'dsa': }
+  ssh::authorized_key_add { 'dbmaster::puppetmaster::nagios-build':
+    target_user => 'puppet',
+    command     => '/srv/puppet.debian.org/sync/bin/puppet-ssh-wrap draghi.debian.org nagiosconfig',
+    key         => $facts['dsa_key'],
+    collect_tag => 'puppetmaster',
+  }
+
+  exim::vdomain { 'db.debian.org':
+    mail_user  => 'mail_db',
+    mail_group => 'nogroup',
+  }
 }