X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fdebconf_wafer.pp;h=b0c2c5ed59a3b1614494628545eb399e46b24323;hb=e9b0dc298740c07aff9b54bb93d40c453a9c23b7;hp=ead40ccb3d57967a788148e26bac143b76961d1f;hpb=ea29fa063ce518fbb642438b4cd36afe744fb48b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debconf_wafer.pp b/modules/roles/manifests/debconf_wafer.pp
index ead40ccb3..b0c2c5ed5 100644
--- a/modules/roles/manifests/debconf_wafer.pp
+++ b/modules/roles/manifests/debconf_wafer.pp
@@ -1,7 +1,17 @@
-class roles::debconf_wafer {
+# debconf's wafer role
+
+# @param db_address     hostname of the postgres server for this service
+# @param db_port        port of the postgres server for this service
+class roles::debconf_wafer (
+  String  $db_address,
+  Integer $db_port,
+) {
+  include apache2
   include apache2::ssl
   include apache2::expires
 
+  include roles::sso_rp
+
   package { 'libapache2-mod-wsgi-py3': ensure => installed, }
   apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
 
@@ -41,5 +51,13 @@ class roles::debconf_wafer {
     site   => 'debconf20.debconf.org',
     source => 'puppet:///modules/roles/debconf_wafer/debconf20.debconf.org',
   }
+
+  @@postgres::cluster::hba_entry { "debconf-wafer-${::fqdn}":
+    tag      => "postgres::cluster::${db_port}::hba::${db_address}",
+    pg_port  => $db_port,
+    user     => ['debconf18', 'debconf19', 'debconf20', 'wafertest'],
+    database => 'sameuser',
+    address  => $base::public_addresses,
+  }
 }