Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60090
Change subject: use SSLCACertificatePath Directive in SSL config
......................................................................
use SSLCACertificatePath Directive in SSL config
Change-Id: Ia7976a4520ce49e89c6a0d7ef1062a00d0e73c25
---
M templates/apache/sites/planet-language.erb
M templates/apache/sites/planet.erb
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/90/60090/1
diff --git a/templates/apache/sites/planet-language.erb
b/templates/apache/sites/planet-language.erb
index c374c25..4b89dec 100644
--- a/templates/apache/sites/planet-language.erb
+++ b/templates/apache/sites/planet-language.erb
@@ -17,7 +17,7 @@
SSLEngine on
SSLCertificateFile /etc/ssl/certs/star.planet.<%= planet_domain_name
%>.pem
SSLCertificateKeyFile /etc/ssl/private/star.planet.<%=
planet_domain_name %>.key
-
+ SSLCACertificatePath /etc/ssl/certs/
<Directory /var/www/planet/<%= @name %>>
Allow from all
</Directory>
diff --git a/templates/apache/sites/planet.erb
b/templates/apache/sites/planet.erb
index 7616527..ab1b7e8 100644
--- a/templates/apache/sites/planet.erb
+++ b/templates/apache/sites/planet.erb
@@ -6,6 +6,7 @@
SSLEngine on
SSLCertificateFile /etc/ssl/certs/star.planet.<%= planet_domain_name
%>.pem
SSLCertificateKeyFile /etc/ssl/private/star.planet.<%=
planet_domain_name %>.key
+ SSLCACertificatePath /etc/ssl/certs/
RewriteEngine on
RewriteRule (.*) http://%{HTTP_HOST}%{REQUEST_URI} [R=301]
--
To view, visit https://gerrit.wikimedia.org/r/60090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7976a4520ce49e89c6a0d7ef1062a00d0e73c25
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
