X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_master.pp;h=1b68123c425975887bfef3f9cefdd3ab8058bc74;hb=e223cc6541f3d038e37352a0fac74010bd7ca624;hp=5f04386b7e6b14b84c7e105eff053d840ed38f42;hpb=0894ec394f74db1488e2fed5a3276d468b9cc2b9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index 5f04386b7..1b68123c4 100644
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -1,11 +1,25 @@
 class roles::ftp_master {
-	rsync::site { 'dakmaster':
-		source        => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
-		max_clients   => 100,
-		sslname       => 'ftp-master.debian.org',
-	}
+  include roles::dakmaster
+  include roles::signing
 
-	ssl::service { 'ftp-master.debian.org':
-		notify => Service['apache2'],
-	}
+  rsync::site { 'dakmaster':
+    source      => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
+    # Needs to be at least number of direct mirrors plus some spare
+    max_clients => 50,
+    sslname     => 'ftp-master.debian.org',
+  }
+
+  ssl::service { 'ftp-master.debian.org':
+    notify   => Exec['service apache2 reload'],
+    key      => true,
+    tlsaport => [443, 1873],
+  }
+
+  # export ssh allow rules for hosts that we should be able to access
+  @@ferm::rule::simple { "dsa-ssh-from-ftp_master-${::fqdn}":
+    tag         => 'ssh::server::from::ftp_master',
+    description => 'Allow ssh access from ftp_master',
+    port        => '22',
+    saddr       => $base::public_addresses,
+  }
 }