X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=3e45e09786991ad73c8d1a3e4b9e5408024cf686;hb=2711caffd5f22064f07c4389ebb46754ce553022;hp=78b0551563dc923d3ddf2b63ea86d010653de3e7;hpb=fef6fe13456346f5ab0c74ef870ee50f23c1607e;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index 78b055156..3e45e0978 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -32,8 +32,19 @@ roles::dns_primary::allow_access:
   - '2a01:3f0:0:28::25'
 # bacula
 #
-bacula::director::bacula_db_address: 'postgresql-manda-01.debian.org'
-bacula::director::bacula_db_port:    5432
+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
@@ -60,23 +71,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