X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=a853b5b04776fd6dfc2db100106bf82f415d7627;hb=8199281b7f26f447723611cff0f7e3057d1e97a8;hp=8e1f05c9f3e41606e59c617f0bb70102b2d963e5;hpb=7af16f703228c0239f4adae38d04ef7612b611c3;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index 8e1f05c9f..a853b5b04 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -30,7 +30,8 @@ roles::dns_primary::allow_access:
   - '194.146.105.25'
   - '2a01:3f0:0:27::24'
   - '2a01:3f0:0:28::25'
-postgres::db_backup_role: 'debian-backup'
+postgres::backup_cluster::db_backup_role: 'debian-backup'
+postgres::backup_server::globals::backup_unix_user: 'debbackup'
 # bacula
 #
 bacula::email_all: 'bacula-reports@admin.debian.org'
@@ -47,6 +48,15 @@ bacula::director::pool_name:  'debian'
 bacula::client::director_server: dinis.debian.org
 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
+
 
 # == other variables
 #####################
@@ -68,16 +78,5 @@ paths:
   auto_clientcerts_dir: '/srv/puppet.debian.org/ca/RESULT/clientcerts'
 apt::sources::debian::location: 'https://deb.debian.org/debian/'
 
-
-# all of these should be retired in favour of including the class role
-# with the host. weasel, 2019-09
-roles:
-  postgresql_server:
-    # these use pg-receive-file-from-backup which is defined in the
-    # postgres::backup_source class.  This should be
-    # cleaned up and handled properly, including the ssh auth keys setup
-    - lw07.debian.org
-    - snapshotdb-manda-01.debian.org
-
 classes:
   - base::includes