X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=4abd2a244f6cbadbb242fb75e35ce419a1e4a3d5;hb=a5118bb7ee4c0ed9c5cea3dcb2243738381467d6;hp=06f0d036d7fcacf45bc75305b18cff15080ae59d;hpb=3f2101f7122e86ccef1513263bd894eb801d4c24;p=mirror%2Fdsa-puppet.git diff --git a/data/common.yaml b/data/common.yaml index 06f0d036d..4abd2a244 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -30,6 +30,7 @@ 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' # bacula # bacula::email_all: 'bacula-reports@admin.debian.org' @@ -71,23 +72,12 @@ 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 + # 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 - - 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