RobH has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334445 )
Change subject: update archiva.w.o to use LE cert 2 of 2 (planned)
......................................................................
update archiva.w.o to use LE cert 2 of 2 (planned)
this patch should set the correct certificate file paths on the
archiva.w.o system. the first patch already generated the files in
place on the system for reference.
Bug:T154942
Change-Id: I9a29c20fbcf798fb9acdcaa410400985ddc07738
---
M modules/archiva/manifests/proxy.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/archiva/manifests/proxy.pp
b/modules/archiva/manifests/proxy.pp
index 59f4faf..d1cc697 100644
--- a/modules/archiva/manifests/proxy.pp
+++ b/modules/archiva/manifests/proxy.pp
@@ -15,7 +15,7 @@
#
class archiva::proxy(
$ssl_enabled = true,
- $certificate_name = 'archiva.wikimedia.org',
+ $certificate_name = 'archiva',
) {
Class['::archiva'] -> Class['::archiva::proxy']
@@ -49,9 +49,9 @@
$ssl_certificate_chained = $certificate_name ? {
'ssl-cert-snakeoil' => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
- default =>
"/etc/ssl/localcerts/${certificate_name}.chained.crt",
+ default =>
"/etc/acme/cert/${certificate_name}.chained.crt",
}
- $ssl_certificate_key = "/etc/ssl/private/${certificate_name}.key"
+ $ssl_certificate_key = "/etc/acme/key/${certificate_name}.key"
# Use puppet's stupidity to flatten these into a single array.
$server_properties = [
--
To view, visit https://gerrit.wikimedia.org/r/334445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a29c20fbcf798fb9acdcaa410400985ddc07738
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <r...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
