X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_master.pp;h=5bef58726336b8d0b127b43854b589499065a7c1;hb=64c1545f242396ff122e1af0ce35cf952a01c58c;hp=11cee8c81afb7f74428c87f3805ab0912a17f7df;hpb=fc98f0be58f40cfae2d854bc7a2b4eeefc1c4146;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index 11cee8c81..5bef58726 100644
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -1,14 +1,25 @@
 class roles::ftp_master {
-	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',
-	}
+  include roles::dakmaster
+  include roles::signing
 
-	ssl::service { 'ftp-master.debian.org':
-		notify   => Exec['service apache2 reload'],
-		key      => true,
-		tlsaport => [443, 1873],
-	}
+  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',
+    chain       => 'ssh',
+    saddr       => $base::public_addresses,
+  }
 }