projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add storage daemon class
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
manifests
/
director.pp
diff --git
a/modules/bacula/manifests/director.pp
b/modules/bacula/manifests/director.pp
index
513d096
..
40720b7
100644
(file)
--- a/
modules/bacula/manifests/director.pp
+++ b/
modules/bacula/manifests/director.pp
@@
-35,13
+35,14
@@
class bacula::director inherits bacula {
refreshonly => true;
}
refreshonly => true;
}
- define bacula_client(
$client
) {
+ define bacula_client() {
# These must be kept in sync with the settings in bacula.pp
# These must be kept in sync with the settings in bacula.pp
- $bacula_client_name = "$client-fd"
- $bacula_client_secret = hmac("/etc/puppet/secret", "bacula-fd-$client")
+ $bacula_client_name = "${name}-fd"
+ $bacula_client_secret = hmac("/etc/puppet/secret", "bacula-fd-${name}")
+ $client = $name
file {
file {
- "/etc/bacula/conf.d/$
client
.conf":
+ "/etc/bacula/conf.d/$
{name}
.conf":
content => template("bacula/per-client.conf.erb"),
mode => 440,
group => bacula,
content => template("bacula/per-client.conf.erb"),
mode => 440,
group => bacula,
@@
-49,6
+50,7
@@
class bacula::director inherits bacula {
;
}
}
;
}
}
+ $allhosts = keys($site::allnodeinfo)
- bacula_client {
allnodeinfo('hostname', '')
}
+ bacula_client {
$allhosts:
}
}
}