From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 30 Sep 2019 06:01:51 +0000 (+0200)
Subject: udd wants guest access on localhost
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=cc5319b112f24a9c0a87d514e38fefe9a093ec75;p=mirror%2Fdsa-puppet.git

udd wants guest access on localhost
---

diff --git a/modules/roles/manifests/buildd_master/db_guest_access.pp b/modules/roles/manifests/buildd_master/db_guest_access.pp
index edc529da2..bacd7dbac 100644
--- a/modules/roles/manifests/buildd_master/db_guest_access.pp
+++ b/modules/roles/manifests/buildd_master/db_guest_access.pp
@@ -3,17 +3,19 @@
 # @param db_address     hostname of the postgres server for this service
 # @param db_port        port of the postgres server for this service
 # @param database       list of databases to give access to
+# @param address        hosts to give access
 class roles::buildd_master::db_guest_access (
   String  $db_address     = $roles::buildd_master::params::db_address,
   Integer $db_port        = $roles::buildd_master::params::db_port,
-  Array[String] $database = ['wanna-build']
+  Array[String] $database = ['wanna-build'],
+  Optional[Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]]] $address = $base::public_addresses,
 ) inherits roles::buildd_master::params {
   @@postgres::cluster::hba_entry { "buildd_master-guest-${::fqdn}":
     tag      => "postgres::cluster::${db_port}::hba::${db_address}",
     pg_port  => $db_port,
     database => $database,
     user     => 'guest',
-    address  => $base::public_addresses,
+    address  => $address,
     method   => 'trust',
     order    => '30',
   }
diff --git a/modules/roles/manifests/udd.pp b/modules/roles/manifests/udd.pp
index 4267b0bd3..16c8b9f33 100644
--- a/modules/roles/manifests/udd.pp
+++ b/modules/roles/manifests/udd.pp
@@ -13,5 +13,6 @@ class roles::udd {
 
   class { 'roles::udd::db_guest_access':
     database => ['udd', 'udd-dev'],
+    address  => ['127.0.0.1', '::1'],
   }
 }
diff --git a/modules/roles/manifests/udd/db_guest_access.pp b/modules/roles/manifests/udd/db_guest_access.pp
index cec9b1e0a..38af91ed4 100644
--- a/modules/roles/manifests/udd/db_guest_access.pp
+++ b/modules/roles/manifests/udd/db_guest_access.pp
@@ -3,17 +3,19 @@
 # @param db_address     hostname of the postgres server for this service
 # @param db_port        port of the postgres server for this service
 # @param database       list of databases to give access to
+# @param address        hosts to give access
 class roles::udd::db_guest_access (
   String  $db_address     = $roles::udd::params::db_address,
   Integer $db_port        = $roles::udd::params::db_port,
-  Array[String] $database = ['udd']
+  Array[String] $database = ['udd'],
+  Optional[Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]]] $address = $base::public_addresses,
 ) inherits roles::udd::params {
   @@postgres::cluster::hba_entry { "udd-guest-${::fqdn}":
     tag      => "postgres::cluster::${db_port}::hba::${db_address}",
     pg_port  => $db_port,
     database => $database,
     user     => 'guest',
-    address  => $base::public_addresses,
+    address  => $address,
     method   => 'trust',
     order    => '30',
   }