X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=9470a066f5d1d0f0f043434e559163a624322780;hb=8199281b7f26f447723611cff0f7e3057d1e97a8;hp=6f92d33a2ee4cee971adca2faa291ed993318717;hpb=cb1653b870f26dacdf6444dcd7520b0556018bfa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 6f92d33a2..9470a066f 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,4 +1,7 @@
 class roles::security_master {
+  include roles::dakmaster
+  include apache2
+
   ssl::service { 'security-master.debian.org':
     notify   => Exec['service apache2 reload'],
     key      => true,
@@ -13,10 +16,10 @@ class roles::security_master {
   }
 
   # export ssh allow rules for hosts that we should be able to access
-  @@ferm::rule::simple { "dsa-ssh-from-syncproxy-${::fqdn}":
-    tag         => 'ssh::server::allow::security-master',
-    description => 'Allow ssh access from security-master',
-    port        => '22',
+  @@ferm::rule::simple { "dsa-ssh-from-security_master-${::fqdn}":
+    tag         => 'ssh::server::from::security_master',
+    description => 'Allow ssh access from security_master',
+    chain       => 'ssh',
     saddr       => $base::public_addresses,
   }
 }