X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=c627ac0f732bd040a17a144a9ebad70100e856df;hb=06b84d9806c855df88bead1c7ea648301351847e;hp=036f0599001b009f7699d54beeb1647c016831bb;hpb=2f1cdab0126ff5f0dfc6b88ba715e303da47c20c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 036f05990..c627ac0f7 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,15 +1,24 @@
 class roles::security_master {
+  include roles::dakmaster
 
-	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,
-		root       => '/srv/ftp.root/',
-	}
+  ssl::service { 'security-master.debian.org':
+    notify   => Exec['service apache2 reload'],
+    key      => true,
+    tlsaport => [443, 1873],
+  }
 
-	rsync::site { 'security_master':
-		source        => 'puppet:///modules/roles/security_master/rsyncd.conf',
-		max_clients => 100,
-	}
+  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',
+  }
+
+  # 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',
+    port        => '22',
+    saddr       => $base::public_addresses,
+  }
 }