X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=4089d11725e4c25e35961578c0876e986de94b4d;hb=b3b7f3c3a80fe6da72b868cf029704d087f9a257;hp=f5c4b7f03985d20f1090ec9548ba54855aa18a64;hpb=8317ae9c41d1692c8bd7585794eddd82010e202b;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index f5c4b7f03..4089d1172 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -7,14 +7,14 @@ lookup_options:
   apt::sources::debian::location:
     merge: unique
 
-# class parameters
+# == class parameters
+#####################
 resolv::nameservers: []
 resolv::searchpaths: ['debian.org']
 staticsync::user: 'staticsync'
 staticsync::basedir: '/srv/static.debian.org'
 exim::smarthost: 'mailout.debian.org'
 postfix::smarthost: 'mailout.debian.org'
-
 roles::dns_primary::allow_access:
   # easydns
   - '64.68.200.91'
@@ -30,8 +30,25 @@ roles::dns_primary::allow_access:
   - '194.146.105.25'
   - '2a01:3f0:0:27::24'
   - '2a01:3f0:0:28::25'
+# 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
+# == other variables
+#####################
 allow_dns_query: []
 role_config__mirrors:
   mirror_basedir_prefix: '/srv/mirrors/'
@@ -61,16 +78,9 @@ roles:
   postgresql_server:
     # postgresql instances not managed by puppet otherwise
     - bmdb1.debian.org
-    - buxtehude.debian.org
-    - danzi.debian.org
-    - fasolo.debian.org
     - 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