BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/215404

Change subject: icinga apache config: Add back missing SSLCertificateFile
......................................................................

icinga apache config: Add back missing SSLCertificateFile

4fb3420cce caused this: you don't remove the certfile directive
when adding the chained directive, apparently.

Change-Id: I3cd452c984c7007d4cb0d3c6138672e1ce24423f
---
M modules/icinga/templates/icinga.wikimedia.org.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/215404/1

diff --git a/modules/icinga/templates/icinga.wikimedia.org.erb 
b/modules/icinga/templates/icinga.wikimedia.org.erb
index db29beb..267b2a2 100644
--- a/modules/icinga/templates/icinga.wikimedia.org.erb
+++ b/modules/icinga/templates/icinga.wikimedia.org.erb
@@ -20,6 +20,7 @@
     ServerAlias neon.wikimedia.org
     ServerAdmin n...@wikimedia.org
     SSLEngine On
+    SSLCertificateFile /etc/ssl/localcerts/icinga.wikimedia.org.crt
     SSLCertificateChainFile 
/etc/ssl/localcerts/icinga.wikimedia.org.chained.crt
     SSLCertificateKeyFile /etc/ssl/private/icinga.wikimedia.org.key
     <%= @ssl_settings.join("\n") %>

-- 
To view, visit https://gerrit.wikimedia.org/r/215404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cd452c984c7007d4cb0d3c6138672e1ce24423f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to