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

diff --git a/data/common.yaml b/data/common.yaml
index 37432d711..73e3c95c6 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/'
@@ -54,65 +71,16 @@ 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:
-  nagiosmaster:
-    # XXX - used by ferm templates/defs.conf.erb
-    - tchaikovsky.debian.org
-  security_mirror:
-    # XXX used also in ferm me.conf.erb
-    mirror-anu.debian.org:
-      fastly-backend: false
-    mirror-csail.debian.org:
-      fastly-backend: false
-    mirror-isc.debian.org:
-      onion_v4_address: 149.20.4.14
-    mirror-umn.debian.org:
-      onion_v4_address: 128.101.240.215
-    mirror-accumu.debian.org:
-      fastly-backend: false
-    mirror-skroutz.debian.org:
-      fastly-backend: false
-    lobos.debian.org:
-      service-hostname: lobos.security.backend.mirrors.debian.org
-      fastly-backend: false
-      onion_v4_address: 212.211.132.250
-    santoro.debian.org:
-      fastly-backend: false
-    schmelzer.debian.org:
-      fastly-backend: false
-    schumann.debian.org:
-      service-hostname: schumann.security.backend.mirrors.debian.org
-      fastly-backend: true
-    setoguchi.debian.org:
-      fastly-backend: false
-    sechter.debian.org:
-      fastly-backend: false
-    villa.debian.org:
-      service-hostname: villa.security.backend.mirrors.debian.org
-      fastly-backend: true
-      onion_v4_address: 212.211.132.32
-    wieck.debian.org:
-      service-hostname: wieck.security.backend.mirrors.debian.org
-      fastly-backend: true
   postgres_backup_server:
     # XXX - used by ferm templates/defs.conf.erb
     - backuphost.debian.org
     - storace.debian.org
-  bgp:
-    - mirror-accumu.debian.org
-    - mirror-skroutz.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