From 8199281b7f26f447723611cff0f7e3057d1e97a8 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 29 Sep 2019 18:55:44 +0200 Subject: [PATCH] guest access for dak on ftp-master --- data/common.yaml | 2 ++ modules/roles/manifests/ftp_master.pp | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/data/common.yaml b/data/common.yaml index 06f3e9b0f..a853b5b04 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -51,6 +51,8 @@ bacula::client::storage_server: storace.debian.org roles::debsources::db_address: bmdb1.debian.org roles::debsources::db_port: 5440 +roles::ftp_master::db_port: 5433 + roles::postgresql::ftp_master_dak_replica::db_server: fasolo.debian.org roles::postgresql::ftp_master_dak_replica::db_port: 5433 roles::postgresql::ftp_master_dak_replica::db_role: repuser diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp index 7b3053aee..b95330c42 100644 --- a/modules/roles/manifests/ftp_master.pp +++ b/modules/roles/manifests/ftp_master.pp @@ -1,4 +1,10 @@ -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 apache2 @@ -23,4 +29,13 @@ class roles::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', + } + } -- 2.20.1