X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=9470a066f5d1d0f0f043434e559163a624322780;hb=7ca975698c14415282e911881890b3b7d8f8dc68;hp=83685a8847b4fe28832b208fa31a9059fa30aa03;hpb=f2c9b24185c3817ff41d22ec006e125e6871a9a2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 83685a884..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,
@@ -11,4 +14,12 @@ class roles::security_master {
     max_clients => 50,
     sslname     => 'security-master.debian.org',
   }
+
+  # 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::from::security_master',
+    description => 'Allow ssh access from security_master',
+    chain       => 'ssh',
+    saddr       => $base::public_addresses,
+  }
 }