Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79777
Change subject: Fix various typos in bacula module
......................................................................
Fix various typos in bacula module
Change-Id: I6c05fb5902bb7cf2216595b880eb0253f55ae202
---
M modules/bacula/manifests/client.pp
M modules/bacula/templates/bacula-client-job.erb
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/79777/1
diff --git a/modules/bacula/manifests/client.pp
b/modules/bacula/manifests/client.pp
index a19dad5..23c9c03 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -62,8 +62,8 @@
# resource
exec { 'concat-bacula-keypair':
command => "/bin/cat /var/lib/puppet/ssl/certs/$::fqdn.pem \
- /var/lib/puppet/ssl/certs//$::fqdn.pem > \
- /var/lib/puppet/ssl/private_keys/bacula_keypair-$::fqdn.pem",
+ /var/lib/puppet/ssl/private_keys/$::fqdn.pem > \
+ /var/lib/puppet/ssl/private_keys/bacula-keypair-$::fqdn.pem",
creates =>
"/var/lib/puppet/ssl/private_keys/bacula-keypair-$::fqdn.pem",
}
diff --git a/modules/bacula/templates/bacula-client-job.erb
b/modules/bacula/templates/bacula-client-job.erb
index cfd6747..91401ac 100644
--- a/modules/bacula/templates/bacula-client-job.erb
+++ b/modules/bacula/templates/bacula-client-job.erb
@@ -1,9 +1,9 @@
# This file has been autogenerated by puppet. Don't edit by hand
Job {
- Name = "<%= @fqdn %>-<%= @jobdef %>-<%= @fileset %>"
+ Name = "<%= @fqdn %>-<%= @jobdefaults %>-<%= @fileset %>"
Client = "<%= @fqdn %>-fd"
- JobDefs = "<%= @jobdef %>"
+ JobDefs = "<%= @jobdefaults %>"
FileSet = "<%= @fileset %>"
- Write Bootstrap = "/var/lib/bacula/<%= @fqdn %>-<%= @jobdef %>-<%=
@fileset %>.bsr"
+ Write Bootstrap = "/var/lib/bacula/<%= @fqdn %>-<%= @jobdefaults %>-<%=
@fileset %>.bsr"
}
--
To view, visit https://gerrit.wikimedia.org/r/79777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c05fb5902bb7cf2216595b880eb0253f55ae202
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
