X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Finit.pp;h=013bcf32111f7598288fb720958401d1b2894248;hb=69a42e4c538f99ba4882bc5ea89a4b687b8bc51c;hp=5084ffb0a66cd9e91a8b4c8181397fbeff56bc86;hpb=5bdc9b7db9dab51eca0fee1f06a2d67cfb250f58;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 5084ffb0a..013bcf321 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -1,28 +1,10 @@
 # bacula class -- defines all the variables we care about in our bacula deployment
 #
 # @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  $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_backup_path         = '/srv/bacula',
-
-  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',
@@ -34,6 +16,9 @@ class bacula (
   String  $tag_bacula_dsa_client_list = 'bacula::dsa::clientlist',
 
   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 },
 ) {
   file { '/usr/local/sbin/bacula-idle-restart':
     mode   => '0555',