X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=c401386851c6e52573ec273d2ac6d84dd6afbed4;hb=be81cf0c1d53ed7b206b91f73e5ab77c8b1ef5d0;hp=5738eb5c895c6c3e30b5f1cb580b0737b97a5f35;hpb=7b5f8bd99839bcbd9080209121f58f9aee5a9831;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index 5738eb5c8..c40138685 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -30,6 +30,8 @@ roles::dns_primary::allow_access:
   - '194.146.105.25'
   - '2a01:3f0:0:27::24'
   - '2a01:3f0:0:28::25'
+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'
@@ -46,6 +48,21 @@ 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::tracker::db_address: danzi.debian.org
+roles::tracker::db_port: 5432
+
+roles::debconf_wafer::db_address: danzi.debian.org
+roles::debconf_wafer::db_port: 5434
+
+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
 #####################
@@ -67,21 +84,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:
-  postgres_backup_server:
-    # XXX - used by ferm templates/defs.conf.erb
-    - backuphost.debian.org
-    - storace.debian.org
-  postgresql_server:
-    # postgresql instances not managed by puppet otherwise
-    - bmdb1.debian.org
-    - buxtehude.debian.org
-    - lw07.debian.org
-    - sallinen.debian.org
-    - snapshotdb-manda-01.debian.org
-
 classes:
   - base::includes