projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
164eea6
)
Unify name of the Messages Resource
author
Peter Palfrader
<peter@palfrader.org>
Wed, 25 Sep 2019 09:31:24 +0000
(11:31 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Wed, 25 Sep 2019 09:31:24 +0000
(11:31 +0200)
modules/bacula/manifests/client/director.pp
patch
|
blob
|
history
modules/bacula/manifests/director.pp
patch
|
blob
|
history
modules/bacula/manifests/storage/director.pp
patch
|
blob
|
history
modules/bacula/templates/bacula-dir.conf.erb
patch
|
blob
|
history
modules/bacula/templates/client/fd-per-director.conf.erb
patch
|
blob
|
history
modules/bacula/templates/storage/sd-per-director.conf.erb
patch
|
blob
|
history
diff --git
a/modules/bacula/manifests/client/director.pp
b/modules/bacula/manifests/client/director.pp
index
4990c11
..
87628a4
100644
(file)
--- a/
modules/bacula/manifests/client/director.pp
+++ b/
modules/bacula/manifests/client/director.pp
@@
-4,9
+4,11
@@
#
# @param director_name bacula name of the dir instance
# @param director_address address of this dir instance that other instances should connect to (dns name)
#
# @param director_name bacula name of the dir instance
# @param director_address address of this dir instance that other instances should connect to (dns name)
+# @param messages_name name of the Messages Resource
define bacula::client::director(
String $director_name,
Stdlib::Host $director_address,
define bacula::client::director(
String $director_name,
Stdlib::Host $director_address,
+ String $messages_name = "Msg-${director_address}", # XXX remove default
) {
include bacula::client
) {
include bacula::client
diff --git
a/modules/bacula/manifests/director.pp
b/modules/bacula/manifests/director.pp
index
5f7fba4
..
486df2e
100644
(file)
--- a/
modules/bacula/manifests/director.pp
+++ b/
modules/bacula/manifests/director.pp
@@
-10,6
+10,7
@@
# @param db_sslca SSL CA store for DB access
# @param director_name bacula name of this dir instance
# @param director_address address of this dir instance that other instances should connect to (dns name)
# @param db_sslca SSL CA store for DB access
# @param director_name bacula name of this dir instance
# @param director_address address of this dir instance that other instances should connect to (dns name)
+# @param messages_name name of the Messages Resource
class bacula::director(
String $db_address,
Integer $db_port,
class bacula::director(
String $db_address,
Integer $db_port,
@@
-21,6
+22,7
@@
class bacula::director(
Optional[String] $db_sslca = undef,
String $director_name = "${::fqdn}-dir",
Stdlib::Host $director_address = $::fqdn,
Optional[String] $db_sslca = undef,
String $director_name = "${::fqdn}-dir",
Stdlib::Host $director_address = $::fqdn,
+ String $messages_name = "Msg-${::fqdn}",
) inherits bacula {
# used by e.g. bconsole
) inherits bacula {
# used by e.g. bconsole
@@
-34,12
+36,14
@@
class bacula::director(
tag => 'bacula::to-storage',
director_name => $director_name,
director_address => $director_address,
tag => 'bacula::to-storage',
director_name => $director_name,
director_address => $director_address,
+ messages_name => $messages_name,
}
# let FDs know we exist
@@bacula::client::director{ $::fqdn:
tag => "bacula::to-fd::${director_address}",
director_name => $director_name,
director_address => $director_address,
}
# let FDs know we exist
@@bacula::client::director{ $::fqdn:
tag => "bacula::to-fd::${director_address}",
director_name => $director_name,
director_address => $director_address,
+ messages_name => $messages_name,
}
ensure_packages ( [
}
ensure_packages ( [
diff --git
a/modules/bacula/manifests/storage/director.pp
b/modules/bacula/manifests/storage/director.pp
index
de4f25e
..
fabce50
100644
(file)
--- a/
modules/bacula/manifests/storage/director.pp
+++ b/
modules/bacula/manifests/storage/director.pp
@@
-4,9
+4,11
@@
#
# @param director_name bacula name of the dir instance
# @param director_address address of this dir instance that other instances should connect to (dns name)
#
# @param director_name bacula name of the dir instance
# @param director_address address of this dir instance that other instances should connect to (dns name)
+# @param messages_name name of the Messages Resource
define bacula::storage::director(
String $director_name,
Stdlib::Host $director_address,
define bacula::storage::director(
String $director_name,
Stdlib::Host $director_address,
+ String $messages_name = "Msg-${director_address}", # XXX remove default
) {
include bacula::storage
) {
include bacula::storage
diff --git
a/modules/bacula/templates/bacula-dir.conf.erb
b/modules/bacula/templates/bacula-dir.conf.erb
index
e94ce58
..
13912fd
100644
(file)
--- a/
modules/bacula/templates/bacula-dir.conf.erb
+++ b/
modules/bacula/templates/bacula-dir.conf.erb
@@
-103,7
+103,7
@@
Catalog {
# Message delivery #
########################################################################
Messages {
# Message delivery #
########################################################################
Messages {
- Name =
Standard
+ Name =
<%= @messages_name %>
mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
operatorcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
#mail on error = <%= @bacula_operator_email %> = all, !skipped
mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
operatorcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
#mail on error = <%= @bacula_operator_email %> = all, !skipped
@@
-134,7
+134,7
@@
JobDefs {
Level = Incremental
FileSet = "Standard Set"
Accurate = yes
Level = Incremental
FileSet = "Standard Set"
Accurate = yes
- Messages =
Standard
+ Messages =
<%= @messages_name %>
Max Full Interval = 50 days
Priority = 10
Write Bootstrap = "/var/lib/bacula/%c.bsr"
Max Full Interval = 50 days
Priority = 10
Write Bootstrap = "/var/lib/bacula/%c.bsr"
@@
-152,7
+152,7
@@
Job {
FileSet = "Standard Set"
Client = <%= @some_client_name%>
Pool = <%= @some_pool_name %>
FileSet = "Standard Set"
Client = <%= @some_client_name%>
Pool = <%= @some_pool_name %>
- Messages =
Standard
+ Messages =
<%= @messages_name %>
Where = /var/tmp/bacula-restores
}
Where = /var/tmp/bacula-restores
}
diff --git
a/modules/bacula/templates/client/fd-per-director.conf.erb
b/modules/bacula/templates/client/fd-per-director.conf.erb
index
25daf0a
..
19c62fc
100644
(file)
--- a/
modules/bacula/templates/client/fd-per-director.conf.erb
+++ b/
modules/bacula/templates/client/fd-per-director.conf.erb
@@
-21,6
+21,6
@@
Director {
# Send all messages except skipped files back to Director
Messages {
# Send all messages except skipped files back to Director
Messages {
- Name =
Msg-<%= scope['bacula::client::client_name'] %>-<%= @director
_name %>
+ Name =
<%= @messages
_name %>
director = <%= @director_name %> = all, !skipped, !restored
}
director = <%= @director_name %> = all, !skipped, !restored
}
diff --git
a/modules/bacula/templates/storage/sd-per-director.conf.erb
b/modules/bacula/templates/storage/sd-per-director.conf.erb
index
34f6423
..
29a29b9
100644
(file)
--- a/
modules/bacula/templates/storage/sd-per-director.conf.erb
+++ b/
modules/bacula/templates/storage/sd-per-director.conf.erb
@@
-19,6
+19,6
@@
Director {
# Send all messages to the Director,
#
Messages {
# Send all messages to the Director,
#
Messages {
- Name =
Standard
+ Name =
<%= @messages_name %>
director = <%= @director_name %> = all
}
director = <%= @director_name %> = all
}