X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=3d4546b1454b6cbcfe85f02acbdca915f43db210;hb=8e73118c48c6ce00092efbb09bfde05c355933fe;hp=9fc2b8997678a5a27557505054752981cf411b86;hpb=fa67a3c70b0ad6f46691ee1495dfa7f249143d52;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index 9fc2b8997..3d4546b14 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -31,7 +31,7 @@ roles::dns_primary::allow_access:
   - '2a01:3f0:0:27::24'
   - '2a01:3f0:0:28::25'
 postgres::backup_cluster::db_backup_role: 'debian-backup'
-postgres::backup_server::global::backup_unix_user: 'debbackup'
+postgres::backup_server::globals::backup_unix_user: 'debbackup'
 # bacula
 #
 bacula::email_all: 'bacula-reports@admin.debian.org'
@@ -69,16 +69,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