X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Finit.pp;h=eee682f2708c07bd6eda7af5f305dfde0269da61;hb=ca6cfbe903b4047800c5323e6d656573375d064d;hp=218645ff600fd42bad974e1b8f69b6738b6176d6;hpb=96231a1fb65da82002de84887d1ef738c5a3dec4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 218645ff6..eee682f27 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -1,31 +1,8 @@
 # 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.
 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',
-
-  # use IP address for ferm.
-  String  $bacula_director_ip_addrs   = '82.195.75.77 2001:41b8:202:deb::311:77',
-  String  $bacula_director_address    = 'dinis.debian.org',
-  Integer $bacula_director_port       = 9101,
-  String  $bacula_storage_address     = 'storace.debian.org',
-  Integer $bacula_storage_port        = 9103,
-  Integer $bacula_client_port         = 9102,
-  String  $bacula_db_address          = 'danzi.debian.org',
-  Integer $bacula_db_port             = 5433,
-
-  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',
@@ -35,9 +12,11 @@ class bacula (
 
   String  $bacula_dsa_client_list     = '/etc/bacula/dsa-clients',
   String  $tag_bacula_dsa_client_list = 'bacula::dsa::clientlist',
+
+  Array[Stdlib::IP::Address] $public_addresses = $base::public_addresses,
 ) {
   file { '/usr/local/sbin/bacula-idle-restart':
-    mode    => '0555',
-    content  => template('bacula/bacula-idle-restart.erb'),
+    mode   => '0555',
+    source => 'puppet:///modules/bacula/bacula-idle-restart',
   }
 }