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

diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp
index c75713f5a..1bd9d2b06 100644
--- a/modules/roles/manifests/dbmaster.pp
+++ b/modules/roles/manifests/dbmaster.pp
@@ -8,35 +8,43 @@
 #
 class roles::dbmaster {
 
-	include roles::pubsub::parameters
+  include roles::pubsub::parameters
 
-	$rabbit_password = $roles::pubsub::parameters::rabbit_password
+  $rabbit_password = $roles::pubsub::parameters::rabbit_password
 
-	ssl::service { 'db.debian.org':
-		notify  => [ Exec['service apache2 reload'],
-		             Service['slapd'] ],
-		key => true,
-		tlsaport => [443, 389, 636],
-	}
+  ssl::service { 'db.debian.org':
+    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("/srv/puppet.debian.org/from-letsencrypt/db.debian.org.key") %>'),
-	       links  => follow,
-	}
+  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':
-		key      => 'dsa-udgenerate',
-		exchange => dsa,
-		topic    => 'dsa.ud.replicate',
-		vhost    => dsa,
-		username => $::fqdn,
-		password => $rabbit_password
-	}
+  roles::pubsub::config { 'generate':
+    key      => 'dsa-udgenerate',
+    exchange => dsa,
+    topic    => 'dsa.ud.replicate',
+    vhost    => dsa,
+    username => $::fqdn,
+    password => $rabbit_password
+  }
 
-	service { 'slapd':
-		ensure => running,
-	}
+  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',
+  }
 }