Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79461
Change subject: bacula module fixes
......................................................................
bacula module fixes
bacula::director::fileset excludes parameter gets a default value of
undef. Templates fixed accordingly
Documentation fix
Change-Id: I2ec71a8fc9f1c02f51e774d01b8273e3085bf373
---
M modules/bacula/manifests/director/catalog.pp
M modules/bacula/manifests/director/fileset.pp
M modules/bacula/templates/bacula-dir-fileset.erb
3 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/79461/1
diff --git a/modules/bacula/manifests/director/catalog.pp
b/modules/bacula/manifests/director/catalog.pp
index 592235a..5907a76 100644
--- a/modules/bacula/manifests/director/catalog.pp
+++ b/modules/bacula/manifests/director/catalog.pp
@@ -19,6 +19,7 @@
# dbhost => 'bacula-db.example.org',
# dbport => '3306',
# dbpassword => 'bacula',
+# }
define bacula::director::catalog($dbname, $dbuser, $dbhost, $dbport,
$dbpassword) {
file { "/etc/bacula/conf.d/catalog-${name}.conf":
ensure => present,
diff --git a/modules/bacula/manifests/director/fileset.pp
b/modules/bacula/manifests/director/fileset.pp
index c672aca..07ab539 100644
--- a/modules/bacula/manifests/director/fileset.pp
+++ b/modules/bacula/manifests/director/fileset.pp
@@ -20,7 +20,7 @@
# excludes => [ '/tmp', ],
# }
-define bacula::director::fileset($includes, $excludes) {
+define bacula::director::fileset($includes, $excludes=undef) {
file { "/etc/bacula/conf.d/fileset-${name}.conf":
ensure => present,
owner => root,
diff --git a/modules/bacula/templates/bacula-dir-fileset.erb
b/modules/bacula/templates/bacula-dir-fileset.erb
index 7225ae8..f014c8f 100644
--- a/modules/bacula/templates/bacula-dir-fileset.erb
+++ b/modules/bacula/templates/bacula-dir-fileset.erb
@@ -8,10 +8,12 @@
File = include
<% end -%>
}
+ <% if @excludes -%>
Exclude {
<% @excludes.each do |exclude| %>
File = exclude
<% end -%>
}
+ <% end -%>
# Ignore FileSet Changes = no
}
--
To view, visit https://gerrit.wikimedia.org/r/79461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ec71a8fc9f1c02f51e774d01b8273e3085bf373
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
