X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=9470a066f5d1d0f0f043434e559163a624322780;hb=8199281b7f26f447723611cff0f7e3057d1e97a8;hp=71927756e254c1f7c65ebe39aa77bfc5f6a63b1b;hpb=f2710a0f5c4ee706cd811ca81d96e72f0f29d29e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 71927756e..9470a066f 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,19 +1,25 @@
 class roles::security_master {
+  include roles::dakmaster
+  include apache2
 
-	ssl::service { 'security-master.debian.org':
-		notify => Service['apache2'],
-	}
+  ssl::service { 'security-master.debian.org':
+    notify   => Exec['service apache2 reload'],
+    key      => true,
+    tlsaport => [443, 1873],
+  }
 
-	vsftpd::site { 'security':
-		banner     => 'security-master.debian.org FTP server (vsftpd)',
-		logfile    => '/var/log/ftp/vsftpd-security-master.debian.org.log',
-		writable   => true,
-		chown_user => dak-unpriv,
-		root       => '/srv/ftp.root/',
-	}
+  rsync::site { 'security_master':
+    source      => 'puppet:///modules/roles/security_master/rsyncd.conf',
+    # Needs to be at least twice the number of direct mirrors (currently 15) plus some spare
+    max_clients => 50,
+    sslname     => 'security-master.debian.org',
+  }
 
-	rsync::site { 'security_master':
-		source        => 'puppet:///modules/roles/security_master/rsyncd.conf',
-		max_clients => 100,
-	}
+  # export ssh allow rules for hosts that we should be able to access
+  @@ferm::rule::simple { "dsa-ssh-from-security_master-${::fqdn}":
+    tag         => 'ssh::server::from::security_master',
+    description => 'Allow ssh access from security_master',
+    chain       => 'ssh',
+    saddr       => $base::public_addresses,
+  }
 }