X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdbmaster.pp;h=2b9bf7f19d2bf9078603fac676af321206be31ec;hb=a84443e11b7d28b6a2958c4bea306f1342b0fa54;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..2b9bf7f19 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,50 @@ 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',
+  }
+
+  ferm::rule::simple { 'finger':
+    port => 'finger',
+  }
+  ferm::rule::simple { 'ldap':
+    port => ['ldap', 'ldaps'],
+  }
+
+  concat { '/etc/apache2/conf-available/puppet-restricted-acl.conf':
+    mode           => '0444',
+    ensure_newline => true,
+    warn           => '# This file is maintained with puppet',
+  }
+  Concat::Fragment <<| tag == 'debian_org::apt_restricted::apache-acl' |>>
+  concat::fragment { 'debian_org::apt_restricted::apache-acl-head':
+    target  => '/etc/apache2/conf-available/puppet-restricted-acl.conf',
+    order   => '01',
+    content => @(EOF)
+      <Macro dsa-apt-restricted-acl>
+      | EOF
+  }
+  concat::fragment { 'debian_org::apt_restricted::apache-acl-tail':
+    target  => '/etc/apache2/conf-available/puppet-restricted-acl.conf',
+    order   => '99',
+    content => @(EOF)
+      </Macro>
+      | EOF
+  }
+  file { '/etc/apache2/conf-enabled/puppet-restricted-acl.conf':
+    ensure => symlink,
+    target => '../conf-available/puppet-restricted-acl.conf',
+    notify => Exec['service apache2 reload'],
+  }
 }