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_client_port => $bacula::bacula_client_port,
}
+
+ @@concat::fragment { "bacula-dsa-client-list::$fqdn":
+ target => $bacula::bacula_dsa_client_list ,
+ content => @("EOF"),
+ ${fqdn}
+ | EOF
+ tag => $bacula::tag_bacula_dsa_client_list,
+ }
}
package { ['bacula-fd']:
require => Package['bacula-fd'],
notify => Service['bacula-fd'],
}
- 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'],
+ if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
+ # old name for the override content
+ file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
+ ensure => absent,
+ }
+ dsa_systemd::override { 'bacula-fd':
+ content => @(EOT)
+ [Service]
+ ExecStart=
+ ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
+ | EOT
+ }
+ } else {
+ file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
+ ensure => absent,
+ }
+ dsa_systemd::override { 'bacula-fd':
+ ensure => absent,
+ }
}
- @ferm::rule { 'dsa-bacula-fd-v4':
- domain => '(ip)',
+ @ferm::rule { 'dsa-bacula-fd':
+ domain => '(ip ip6)',
description => 'Allow bacula access from storage and director',
- rule => "proto tcp mod state state (NEW) dport (${bacula_client_port}) saddr (${bacula_director_ip}) ACCEPT",
+ rule => "proto tcp mod state state (NEW) dport (${bacula_client_port}) saddr (${bacula_director_ip_addrs}) ACCEPT",
}
-
- #@ferm::rule { 'dsa-bacula-fd-v6':
- # domain => '(ip6)',
- # description => 'Allow bacula access from storage and director',
- # rule => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip6}) ACCEPT",
- #}
}