Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79800
Change subject: Present our cert to clients, autolabel volumes
......................................................................
Present our cert to clients, autolabel volumes
Change-Id: Iaa81c69512d03320fd0758009662ea3a3e61ae04
---
M manifests/role/backup.pp
M modules/bacula/templates/bacula-client.erb
2 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/79800/1
diff --git a/manifests/role/backup.pp b/manifests/role/backup.pp
index 437b1a2..9612236 100644
--- a/manifests/role/backup.pp
+++ b/manifests/role/backup.pp
@@ -22,6 +22,7 @@
max_vols => 30,
storage => 'FileStorage1',
volume_retention => '180 days',
+ label_fmt => 'production',
}
# Default pool needed internally by bacula
diff --git a/modules/bacula/templates/bacula-client.erb
b/modules/bacula/templates/bacula-client.erb
index e38986d..e4ffe00 100644
--- a/modules/bacula/templates/bacula-client.erb
+++ b/modules/bacula/templates/bacula-client.erb
@@ -12,6 +12,8 @@
TLS Enable = yes
TLS Require = yes
TLS CA Certificate File = "/var/lib/puppet/ssl/certs/ca.pem"
+ TLS Certificate = "/var/lib/puppet/ssl/certs/<%= @director -%>.pem"
+ TLS Key = "/var/lib/puppet/ssl/private_keys/<%= @director -%>.pem"
# Priority = 10
# Maximum Bandwith Per Job =
# Autoprune = yes
--
To view, visit https://gerrit.wikimedia.org/r/79800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa81c69512d03320fd0758009662ea3a3e61ae04
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
