X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=b9e458947bde7e13981a908b017343a01414d459;hb=fe55cd15033254feddb2183185b3c41967eca9fd;hp=3e45e09786991ad73c8d1a3e4b9e5408024cf686;hpb=60761867cccbfa7f472fb13fdd2d704d4cb32b92;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index 3e45e0978..b9e458947 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,9 @@ 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
+
 
 # == other variables
 #####################
@@ -67,16 +72,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