X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=143259f214cee8a258aa2183194e30fd02220380;hb=64c1545f242396ff122e1af0ce35cf952a01c58c;hp=702e2e2aeb822f52f4c35fc30025c51b35252cbb;hpb=9e758f3961ae8e202c90a67fb8ef01e1d662474d;p=mirror%2Fdsa-puppet.git

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