X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=73e3c95c6af5100029a2b303c95e4ce400444c81;hb=d35d08f6432473ce22bd43c7abb0a976a4048c36;hp=d8b84a3cf35781fb096378b8b7c8c25ff9c20fce;hpb=8610e08a607c6249308c4d80d52df6f6c88a5a51;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index d8b84a3cf..73e3c95c6 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -32,7 +32,12 @@ roles::dns_primary::allow_access:
   - '2a01:3f0:0:28::25'
 # bacula
 #
-bacula::operator_email: 'bacula-reports@admin.debian.org'
+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'
@@ -71,18 +76,11 @@ roles:
     - 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