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

diff --git a/data/common.yaml b/data/common.yaml
index ff5efc0fe..9fc2b8997 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -30,11 +30,23 @@ 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::global::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
 
 
 # == other variables
@@ -61,23 +73,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