X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=cee2ca0faa0eb1d44a37e60f12022548b70a8abb;hb=refs%2Fheads%2Fsalsa;hp=d750bc0d95d1438ed8d8f82b4fcbe5aab71010f2;hpb=d348da25beaad1ff77c3f94b8b1b53fc29f6b3ef;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index d750bc0d9..cee2ca0fa 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -32,6 +32,7 @@ roles::dns_primary::allow_access:
   - '2a01:3f0:0:28::25'
 postgres::backup_cluster::db_backup_role: 'debian-backup'
 postgres::backup_server::globals::backup_unix_user: 'debbackup'
+webserver::defaultpage::defaultdomain: 'default.debian.org'
 # bacula
 #
 bacula::email_all: 'bacula-reports@admin.debian.org'
@@ -49,6 +50,57 @@ bacula::client::director_server: dinis.debian.org
 bacula::client::storage_server: storace.debian.org
 
 
+roles::buildd_master::params::db_address: danzi.debian.org
+roles::buildd_master::params::db_port: 5436
+roles::buildd_master::qa_buildlogchecks_db_address: bmdb1.debian.org
+roles::buildd_master::qa_buildlogchecks_db_port: 5435
+
+roles::ddtp::db_address: danzi.debian.org
+roles::ddtp::db_port: 5437
+
+roles::debconf_wafer::db_address: danzi.debian.org
+roles::debconf_wafer::db_port: 5434
+
+roles::debsources::db_address: bmdb1.debian.org
+roles::debsources::db_port: 5440
+
+roles::debtags::db_address: bmdb1.debian.org
+roles::debtags::db_port: 5435
+
+roles::ftp_master::db_port: 5433
+
+roles::nm::db_address: danzi.debian.org
+roles::nm::db_port: 5433
+
+roles::postgresql::ftp_master_dak_replica::db_guest_access::bm::db_address: bmdb1.debian.org
+roles::postgresql::ftp_master_dak_replica::db_guest_access::bm::db_port: 5434
+
+roles::postgresql::ftp_master_dak_replica::db_guest_access::ubc::db_address: danzi.debian.org
+roles::postgresql::ftp_master_dak_replica::db_guest_access::ubc::db_port: 5435
+
+roles::qamaster::db_address: bmdb1.debian.org
+roles::qamaster::db_port: 5435
+
+roles::release::db_address: bmdb1.debian.org
+roles::release::db_port: 5435
+
+roles::rtmaster::db_address: danzi.debian.org
+roles::rtmaster::db_port: 5433
+
+roles::sso::db_address: danzi.debian.org
+roles::sso::db_port: 5433
+
+roles::tracker::db_address: danzi.debian.org
+roles::tracker::db_port: 5432
+
+roles::udd::params::db_address: ullmann.debian.org
+roles::udd::params::db_port: 5452
+
+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
 #####################
 allow_dns_query: []
@@ -69,15 +121,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
-    - snapshotdb-manda-01.debian.org
-
 classes:
   - base::includes