include signing from the ftp_master role

[mirror/dsa-puppet.git] / modules / roles / manifests / ftp_master.pp

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index 10b5bb6..1b68123 100644 (file)
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -1,4 +1,7 @@
 class roles::ftp_master {
+  include roles::dakmaster
+  include roles::signing
+
   rsync::site { 'dakmaster':
     source      => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
     # Needs to be at least number of direct mirrors plus some spare
@@ -14,7 +17,7 @@ class roles::ftp_master {
 
   # 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::allow::ftp_master',
+    tag         => 'ssh::server::from::ftp_master',
     description => 'Allow ssh access from ftp_master',
     port        => '22',
     saddr       => $base::public_addresses,