X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_master.pp;h=c73347932be57b4fe9dd191d8f430fe686702c74;hb=06b84d9806c855df88bead1c7ea648301351847e;hp=a76e06819d8a93900cdd98aab0c0d534001c1d88;hpb=8e104735c829bddd66c9f0aacfa0f41e92eed57d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index a76e06819..c73347932 100644
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -1,11 +1,22 @@
 class roles::ftp_master {
-	rsync::site { 'dakmaster':
-		source        => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
-		max_clients   => 100,
-		sslname       => 'ftp-master.debian.org',
-	}
+  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'],
-	}
+  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,
+  }
 }