class bacula::client inherits bacula {
- @@bacula::storage-per-node { $::fqdn: }
+ @@bacula::storage_per_node { $::fqdn: }
if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
- @@bacula::node { $::fqdn: }
+ @@bacula::node { $::fqdn:
+ bacula_client_port => $bacula::bacula_client_port,
+ }
}
package { ['bacula-fd']:
path => '/usr/bin:/usr/sbin:/bin:/sbin',
command => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart fd &"',
refreshonly => true,
- subscribe => File['/etc/ssl/debian/certs/thishost.crt'],
+ subscribe => [ File[$bacula_ssl_server_cert], File[$bacula_ssl_client_cert] ],
require => File['/usr/local/sbin/bacula-idle-restart'],
}
owner => root,
group => bacula,
require => Package['bacula-fd'],
- notify => Service['bacula-fd'],
+ notify => Exec['bacula-fd restart-when-idle'],
}
file { '/usr/local/sbin/bacula-backup-dirs':
mode => '0775',
require => Package['bacula-fd'],
notify => Service['bacula-fd'],
}
- if $::lsbmajdistrelease < 7 {
- file { '/etc/apt/preferences.d/dsa-bacula-client':
- content => template('bacula/apt.preferences.bacula-client.erb'),
- mode => '0444',
- owner => root,
- group => root,
+ if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
+ file { '/etc/systemd/system/bacula-fd.service.d':
+ ensure => directory,
+ mode => '0755',
+ owner => root,
+ group => root,
+ }
+ file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
+ source => 'puppet:///modules/bacula/bacula-fd-systemd',
+ mode => '0400',
+ owner => root,
+ group => root,
+ notify => Exec['systemctl daemon-reload'],
}
} else {
- file { '/etc/apt/preferences.d/dsa-bacula-client':
- ensure => absent
+ file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
+ ensure => absent,
}
}
@ferm::rule { 'dsa-bacula-fd-v4':
domain => '(ip)',
description => 'Allow bacula access from storage and director',
- rule => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip}) ACCEPT",
+ rule => "proto tcp mod state state (NEW) dport (${bacula_client_port}) saddr (${bacula_director_ip}) ACCEPT",
}
#@ferm::rule { 'dsa-bacula-fd-v6':