Merge branch 'salsa' into fordsa

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

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index c627ac0..9470a06 100644 (file)
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,5 +1,6 @@
 class roles::security_master {
   include roles::dakmaster
+  include apache2
 
   ssl::service { 'security-master.debian.org':
     notify   => Exec['service apache2 reload'],
@@ -18,7 +19,7 @@ class roles::security_master {
   @@ferm::rule::simple { "dsa-ssh-from-security_master-${::fqdn}":
     tag         => 'ssh::server::from::security_master',
     description => 'Allow ssh access from security_master',
-    port        => '22',
+    chain       => 'ssh',
     saddr       => $base::public_addresses,
   }
 }