projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split the director config coming from each node in two parts: one that comes from...
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
manifests
/
client.pp
diff --git
a/modules/bacula/manifests/client.pp
b/modules/bacula/manifests/client.pp
index
dfeb176
..
2b7c35f
100644
(file)
--- a/
modules/bacula/manifests/client.pp
+++ b/
modules/bacula/manifests/client.pp
@@
-2,7
+2,15
@@
#
# this mostly configures the file daemon, but also firewall rules and
# fragments to sent to the other servers.
#
# this mostly configures the file daemon, but also firewall rules and
# fragments to sent to the other servers.
+#
+# @param director_server The director server that controls this client's backups
+# @param storage_server The storage server to use for this client
+# @param port_fd Port that bacula-fd listens on
+# @param ensure present or absent
class bacula::client(
class bacula::client(
+ String $director_server,
+ String $storage_server,
+ Integer $port_fd = 9102,
Enum['present', 'absent'] $ensure = defined(Class['bacula::not_a_client']) ? { true => 'absent', default => 'present' },
) inherits bacula {
$package_ensure = $ensure ? { 'present' => 'installed', 'absent' => 'purged' }
Enum['present', 'absent'] $ensure = defined(Class['bacula::not_a_client']) ? { true => 'absent', default => 'present' },
) inherits bacula {
$package_ensure = $ensure ? { 'present' => 'installed', 'absent' => 'purged' }
@@
-11,10
+19,14
@@
class bacula::client(
$reverse_ensure = $ensure ? { 'present' => 'absent', 'absent' => 'present' }
if $ensure == 'present' {
$reverse_ensure = $ensure ? { 'present' => 'absent', 'absent' => 'present' }
if $ensure == 'present' {
- @@bacula::storage_per_node { $::fqdn: }
+ @@bacula::director::client { $::fqdn:
+ port_fd => $port_fd,
+ tag => "bacula::to-director::${director_server}",
+ }
- @@bacula::node { $::fqdn:
- bacula_client_port => $bacula::bacula_client_port,
+ @@bacula::storage::client { $::fqdn:
+ tag => "bacula::to-storage::${storage_server}",
+ director_server => $director_server,
}
@@concat::fragment { "bacula-dsa-client-list::${::fqdn}":
}
@@concat::fragment { "bacula-dsa-client-list::${::fqdn}":
@@
-26,13
+38,13
@@
class bacula::client(
}
# allow access from director
}
# allow access from director
- Ferm::Rule::Simple <<| tag == "bacula::director-to-fd::${
bacula::bacula_director_address
}" |>> {
- port => $
bacula::bacula_client_port
,
+ Ferm::Rule::Simple <<| tag == "bacula::director-to-fd::${
director_server
}" |>> {
+ port => $
port_fd
,
}
# get access to the storage
@@ferm::rule::simple { "bacula::fd-to-storage::${::fqdn}":
}
# get access to the storage
@@ferm::rule::simple { "bacula::fd-to-storage::${::fqdn}":
- tag => "bacula::
director-to-storage::${bacula::bacula_storage_address
}",
+ tag => "bacula::
fd-to-storage::${storage_server
}",
description => 'Allow bacula-fd access to the bacula-storage',
chain => 'bacula-sd',
saddr => $bacula::public_addresses,
description => 'Allow bacula-fd access to the bacula-storage',
chain => 'bacula-sd',
saddr => $bacula::public_addresses,
@@
-62,7
+74,7
@@
class bacula::client(
exec { 'bacula-fd restart-when-idle':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
exec { 'bacula-fd restart-when-idle':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
- command =>
'sh -c "setsid /usr/local/sbin/bacula-idle-restart fd &"'
,
+ command =>
"sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${port_fd} bacula-fd &'"
,
refreshonly => true,
subscribe => [ File[$bacula::bacula_ssl_server_cert], File[$bacula::bacula_ssl_client_cert] ],
require => File['/usr/local/sbin/bacula-idle-restart'],
refreshonly => true,
subscribe => [ File[$bacula::bacula_ssl_server_cert], File[$bacula::bacula_ssl_client_cert] ],
require => File['/usr/local/sbin/bacula-idle-restart'],