X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_master.pp;h=37219b68c315f0e0c8c4f5468fcbd19027c87b98;hb=7faa529dc53ec3a141d018231c27a9a36707c727;hp=f8d6f877e8d20182849d2c236c49e9c478459760;hpb=cb1653b870f26dacdf6444dcd7520b0556018bfa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index f8d6f877e..37219b68c 100644
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -1,4 +1,15 @@
-class roles::ftp_master {
+# ftpmaster role
+#
+# @param db_port    port of the database cluster for ftp-master's dak
+class roles::ftp_master (
+  Integer $db_port,
+)
+{
+  include roles::dakmaster
+  include roles::signing
+  include roles::historical_master
+  include apache2
+
   rsync::site { 'dakmaster':
     source      => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
     # Needs to be at least number of direct mirrors plus some spare
@@ -13,10 +24,20 @@ class roles::ftp_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::ftp-master',
-    description => 'Allow ssh access from ftp-master',
-    port        => '22',
+  @@ferm::rule::simple { "dsa-ssh-from-ftp_master-${::fqdn}":
+    tag         => 'ssh::server::from::ftp_master',
+    description => 'Allow ssh access from ftp_master',
+    chain       => 'ssh',
     saddr       => $base::public_addresses,
   }
+
+  postgres::cluster::hba_entry { 'dak-guest':
+    pg_port  => $db_port,
+    database => 'projectb',
+    user     => 'guest',
+    address  => '127.0.0.1',
+    method   => 'trust',
+    order    => '20',
+    firewall => false,
+  }
 }