Try to reload bacula-director on changes instead of restart

[mirror/dsa-puppet.git] / modules / bacula / manifests / init.pp

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index d57280d..bf2ed30 100644 (file)
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -10,7 +10,9 @@ class bacula {
        $bacula_filestor_device   = 'FileStorage'
        $bacula_pool_name         = 'debian'
 
-       $bacula_director_address  = 'dinis.debian.org'
+       # $bacula_director_address  = 'dinis.debian.org'
+       # use IP address for ferm.
+       $bacula_director_address  = '206.12.19.139'
        $bacula_director_port     = 9101
        $bacula_storage_address   = 'beethoven.debian.org'
        $bacula_storage_port      = 9103
@@ -20,20 +22,9 @@ class bacula {
 
        $bacula_backup_path       = '/srv/bacula'
 
-       $bacula_director_secret   = hmac('/etc/puppet/secret', "bacula-dir-${::hostname}")
-       $bacula_db_secret         = hmac('/etc/puppet/secret', "bacula-db-${::hostname}")
-       $bacula_storage_secret    = hmac('/etc/puppet/secret', "bacula-sd-${bacula_storage_name}")
-       $bacula_client_secret     = hmac('/etc/puppet/secret', "bacula-fd-${::fqdn}")
-       $bacula_monitor_secret    = hmac('/etc/puppet/secret', "bacula-monitor-${bacula_director_name}")
-
-       package { 'bacula-console':
-               ensure => installed;
-       }
-
-       file { '/etc/bacula/bconsole.conf':
-               content => template('bacula/bconsole.conf.erb'),
-               mode    => '0640',
-               group   => bacula,
-               require => Package['bacula-console']
-       }
+       $bacula_director_secret   = hkdf('/etc/puppet/secret', "bacula-dir-${::hostname}")
+       $bacula_db_secret         = hkdf('/etc/puppet/secret', "bacula-db-${::hostname}")
+       $bacula_storage_secret    = hkdf('/etc/puppet/secret', "bacula-sd-${bacula_storage_name}")
+       $bacula_client_secret     = hkdf('/etc/puppet/secret', "bacula-fd-${::fqdn}")
+       $bacula_monitor_secret    = hkdf('/etc/puppet/secret', "bacula-monitor-${bacula_director_name}")
 }