projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
71bb134
)
udd wants guest access on localhost
author
Peter Palfrader
<peter@palfrader.org>
Mon, 30 Sep 2019 06:01:51 +0000
(08:01 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Mon, 30 Sep 2019 06:01:51 +0000
(08:01 +0200)
modules/roles/manifests/buildd_master/db_guest_access.pp
patch
|
blob
|
history
modules/roles/manifests/udd.pp
patch
|
blob
|
history
modules/roles/manifests/udd/db_guest_access.pp
patch
|
blob
|
history
diff --git
a/modules/roles/manifests/buildd_master/db_guest_access.pp
b/modules/roles/manifests/buildd_master/db_guest_access.pp
index
edc529d
..
bacd7db
100644
(file)
--- 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 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,
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',
) 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_addresse
s,
+ address => $
addres
s,
method => 'trust',
order => '30',
}
method => 'trust',
order => '30',
}
diff --git
a/modules/roles/manifests/udd.pp
b/modules/roles/manifests/udd.pp
index
4267b0b
..
16c8b9f
100644
(file)
--- 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'],
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
cec9b1e
..
38af91e
100644
(file)
--- 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 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,
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',
) 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_addresse
s,
+ address => $
addres
s,
method => 'trust',
order => '30',
}
method => 'trust',
order => '30',
}