X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=11973469f31a8db1be7382020d625bccb041ff0c;hb=43fff1fc191e08503bb43a5b9fb28f0f2c93665e;hp=f5c4b7f03985d20f1090ec9548ba54855aa18a64;hpb=8317ae9c41d1692c8bd7585794eddd82010e202b;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index f5c4b7f03..11973469f 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -7,14 +7,14 @@ lookup_options:
   apt::sources::debian::location:
     merge: unique
 
-# class parameters
+# == class parameters
+#####################
 resolv::nameservers: []
 resolv::searchpaths: ['debian.org']
 staticsync::user: 'staticsync'
 staticsync::basedir: '/srv/static.debian.org'
 exim::smarthost: 'mailout.debian.org'
 postfix::smarthost: 'mailout.debian.org'
-
 roles::dns_primary::allow_access:
   # easydns
   - '64.68.200.91'
@@ -30,8 +30,78 @@ 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'
+bacula::ssl_ca_path:     '/etc/ssl/debian/certs/ca.crt'
+bacula::ssl_client_cert: '/etc/ssl/debian/certs/thishost.crt'
+bacula::ssl_client_key:  '/etc/ssl/private/thishost.key'
+bacula::ssl_server_cert: '/etc/ssl/debian/certs/thishost-server.crt'
+bacula::ssl_server_key:  '/etc/ssl/private/thishost-server.key'
+bacula::director::db_address: 'postgresql-manda-01.debian.org'
+bacula::director::db_port:    5432
+bacula::director::db_sslca:   '/etc/ssl/debian/certs/ca.crt'
+bacula::director::pool_name:  'debian'
+
+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::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::pet::params::db_address: bmdb1.debian.org
+roles::pet::params::db_port: 5435
+
+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
 
-# other variables
+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: []
 role_config__mirrors:
   mirror_basedir_prefix: '/srv/mirrors/'
@@ -50,27 +120,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
-    - danzi.debian.org
-    - fasolo.debian.org
-    - lw07.debian.org
-    - melartin.debian.org
-    - postgresql-manda-01.debian.org
-    - sallinen.debian.org
-    - seger.debian.org
-    - snapshotdb-manda-01.debian.org
-    - vittoria.debian.org
-
 classes:
   - base::includes