X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=970397ae8d976ccc664ab2f01e2840f11bd071d2;hb=b00db688588f052e860f0ff461c0b787f9c5227b;hp=6c569ed89083ee25bc9d3fca0f7aecb6f6f1ae98;hpb=a50e124a9769f33fd71be1055e7efad71336d928;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index 6c569ed89..970397ae8 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::operator_email: '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,88 +71,10 @@ 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:
-  muninmaster:
-    # XXX - used by ferm templates/defs.conf.erb
-    - menotti.debian.org
-  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
-  debian_mirror:
-    # XXX used also in ferm me.conf.erb
-    new-klecker.debian.org:
-      listen-addresses:
-        - '130.89.148.12:80'
-        - '[2001:67c:2564:a119::148:12]:80'
-      onion_v4_address: 130.89.148.12
-    mirror-accumu.debian.org:
-      service-hostname: accumu.debian.backend.mirrors.debian.org
-      fastly-backend: true
-    mirror-skroutz.debian.org:
-      service-hostname: skroutz.debian.backend.mirrors.debian.org
-      fastly-backend: true
-    mirror-isc.debian.org:
-      listen-addresses:
-        - '149.20.4.15:80'
-        - '[2001:4f8:1:c::15]:80'
-      onion_v4_address: 149.20.4.15
-    schmelzer.debian.org:
-      listen-addresses:
-        - '217.196.149.232:80'
-        - '[2a02:16a8:dc41:100::232]:80'
-      fastly-backend: true
-      service-hostname: conova.debian.backend.mirrors.debian.org
-  debug_mirror:
-    # XXX still used by the mirror health stuff
-    mirror-accumu.debian.org:
-      service-hostname: accumu.debug.backend.mirrors.debian.org
-    schmelzer.debian.org:
-      service-hostname: conova.debug.backend.mirrors.debian.org
-  debug_mirror_onion:
-    - mirror-accumu.debian.org
-    - schmelzer.debian.org
-  bgp:
-    - mirror-accumu.debian.org
-    - mirror-skroutz.debian.org
   postgresql_server:
     # postgresql instances not managed by puppet otherwise
     - bmdb1.debian.org