X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Finit.pp;h=cff4087b7131e6d80c7a9997028aca959c6c828e;hb=8610e08a607c6249308c4d80d52df6f6c88a5a51;hp=0caa7dab89558f719621fb1014e9b816345fd2c3;hpb=710c80f43aed35f4c0f061274b525ae422392975;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 0caa7dab8..cff4087b7 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -1,38 +1,27 @@
 # bacula class -- defines all the variables we care about in our bacula deployment
 #
+# @param operator_email   email address for reports
 # @param public_addresses this host's public IP addresses.  The ones it connects out from and is reachable from outsite.
+# @param has_ipv4         daemons should listen on ipv4
+# @param has_ipv6         daemons should listen on ipv6
 class bacula (
-  String  $bacula_operator_email      = 'bacula-reports@admin.debian.org',
-  String  $bacula_director_name       = 'debian-dir',
-  String  $bacula_storage_name        = 'debian-sd',
-  String  $bacula_client_name         = "${::fqdn}-fd",
-  String  $bacula_monitor_name        = 'debian-mon',
-  String  $bacula_filestor_name       = 'File',
-  String  $bacula_filestor_device     = 'FileStorage',
-  String  $bacula_pool_name           = 'debian',
+  String  $operator_email          = 'root@localhost',
 
-  String  $bacula_director_address    = 'dinis.debian.org',
-  Integer $bacula_director_port       = 9101,
-  String  $bacula_storage_address     = 'storace.debian.org',
-  Integer $bacula_storage_port        = 9103,
-
-  String  $bacula_director_secret     = hkdf('/etc/puppet/secret', "bacula-dir-${::hostname}"),
-  String  $bacula_db_secret           = hkdf('/etc/puppet/secret', "bacula-db-${::hostname}"),
-  String  $bacula_storage_secret      = hkdf('/etc/puppet/secret', "bacula-sd-${bacula_storage_name}"),
-  String  $bacula_client_secret       = hkdf('/etc/puppet/secret', "bacula-fd-${::fqdn}"),
-  String  $bacula_monitor_secret      = hkdf('/etc/puppet/secret', "bacula-monitor-${bacula_director_name}"),
-
-  String  $bacula_ca_path             = '/etc/ssl/debian/certs/ca.crt',
-  String  $bacula_ssl_client_cert     = '/etc/ssl/debian/certs/thishost.crt',
-  String  $bacula_ssl_client_key      = '/etc/ssl/private/thishost.key',
-  String  $bacula_ssl_server_cert     = '/etc/ssl/debian/certs/thishost-server.crt',
-  String  $bacula_ssl_server_key      = '/etc/ssl/private/thishost-server.key',
-
-  String  $bacula_dsa_client_list     = '/etc/bacula/dsa-clients',
-  String  $tag_bacula_dsa_client_list = 'bacula::dsa::clientlist',
+  String  $bacula_ca_path          = '/etc/ssl/debian/certs/ca.crt',
+  String  $bacula_ssl_client_cert  = '/etc/ssl/debian/certs/thishost.crt',
+  String  $bacula_ssl_client_key   = '/etc/ssl/private/thishost.key',
+  String  $bacula_ssl_server_cert  = '/etc/ssl/debian/certs/thishost-server.crt',
+  String  $bacula_ssl_server_key   = '/etc/ssl/private/thishost-server.key',
 
   Array[Stdlib::IP::Address] $public_addresses = $base::public_addresses,
+
+  Boolean $has_ipv4        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V4 },
+  Boolean $has_ipv6        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V6 },
 ) {
+  # This file is used by our helper scripts on the director
+  $bacula_dsa_client_list     = '/etc/bacula/dsa-clients'
+  $tag_bacula_dsa_client_list = 'bacula::dsa::clientlist'
+
   file { '/usr/local/sbin/bacula-idle-restart':
     mode   => '0555',
     source => 'puppet:///modules/bacula/bacula-idle-restart',