[MediaWiki-commits] [Gerrit] chain fixes: ganglia, icinga, lists, rt, tendril, wikitech - change (operations/puppet)

2015-07-07 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: chain fixes: ganglia, icinga, lists, rt, tendril, wikitech
..

chain fixes: ganglia, icinga, lists, rt, tendril, wikitech

Change-Id: Id372d6e8bc5925cfdf15dc8ee374e3df14b4eef1
---
M modules/ganglia_new/manifests/web.pp
M modules/icinga/templates/icinga.wikimedia.org.erb
M modules/mailman/templates/lists.wikimedia.org.erb
M modules/requesttracker/templates/rt4.apache.erb
M modules/tendril/templates/apache/tendril.wikimedia.org.erb
M templates/apache/sites/wikitech.wikimedia.org.erb
6 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/223456/1

diff --git a/modules/ganglia_new/manifests/web.pp 
b/modules/ganglia_new/manifests/web.pp
index f5dd092..0f56e0e 100644
--- a/modules/ganglia_new/manifests/web.pp
+++ b/modules/ganglia_new/manifests/web.pp
@@ -13,7 +13,7 @@
 $ganglia_serveralias = 'uranium.wikimedia.org'
 $ganglia_webdir = '/usr/share/ganglia-webfrontend'
 $ganglia_ssl_cert = '/etc/ssl/localcerts/ganglia.wikimedia.org.crt'
-$ganglia_ssl_chain = 
'/etc/ssl/localcerts/ganglia.wikimedia.org.chained.crt'
+$ganglia_ssl_chain = '/etc/ssl/localcerts/ganglia.wikimedia.org.chain.crt'
 $ganglia_ssl_key = '/etc/ssl/private/ganglia.wikimedia.org.key'
 $ssl_settings = ssl_ciphersuite('apache-2.4', 'compat')
 
diff --git a/modules/icinga/templates/icinga.wikimedia.org.erb 
b/modules/icinga/templates/icinga.wikimedia.org.erb
index 267b2a2..48edc5e 100644
--- a/modules/icinga/templates/icinga.wikimedia.org.erb
+++ b/modules/icinga/templates/icinga.wikimedia.org.erb
@@ -21,7 +21,7 @@
 ServerAdmin n...@wikimedia.org
 SSLEngine On
 SSLCertificateFile /etc/ssl/localcerts/icinga.wikimedia.org.crt
-SSLCertificateChainFile 
/etc/ssl/localcerts/icinga.wikimedia.org.chained.crt
+SSLCertificateChainFile /etc/ssl/localcerts/icinga.wikimedia.org.chain.crt
 SSLCertificateKeyFile /etc/ssl/private/icinga.wikimedia.org.key
 %= @ssl_settings.join(\n) %
 
diff --git a/modules/mailman/templates/lists.wikimedia.org.erb 
b/modules/mailman/templates/lists.wikimedia.org.erb
index d2f1d36..7561e52 100644
--- a/modules/mailman/templates/lists.wikimedia.org.erb
+++ b/modules/mailman/templates/lists.wikimedia.org.erb
@@ -12,8 +12,8 @@
 ServerName lists.wikimedia.org
 SSLEngine On
 SSLCertificateFile /etc/ssl/localcerts/lists.wikimedia.org.crt
+SSLCertificateChainFile /etc/ssl/localcerts/lists.wikimedia.org.chain.crt
 SSLCertificateKeyFile /etc/ssl/private/lists.wikimedia.org.key
-SSLCACertificatePath /etc/ssl/certs
 %= @ssl_settings.join(\n) %
 
 # Does not obey robots.txt; causing operational issues, 2014-06-23
diff --git a/modules/requesttracker/templates/rt4.apache.erb 
b/modules/requesttracker/templates/rt4.apache.erb
index a4875bd..fe378e1 100644
--- a/modules/requesttracker/templates/rt4.apache.erb
+++ b/modules/requesttracker/templates/rt4.apache.erb
@@ -15,8 +15,8 @@
 
   SSLEngine on
   SSLCertificateFile /etc/ssl/localcerts/rt.wikimedia.org.crt
+  SSLCertificateChainFile /etc/ssl/localcerts/rt.wikimedia.org.chain.crt
   SSLCertificateKeyFile /etc/ssl/private/rt.wikimedia.org.key
-  SSLCACertificatePath /etc/ssl/certs
   %= @ssl_settings.join(\n) %
 
   AddDefaultCharset UTF-8
diff --git a/modules/tendril/templates/apache/tendril.wikimedia.org.erb 
b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
index 334afbc..dc374db 100644
--- a/modules/tendril/templates/apache/tendril.wikimedia.org.erb
+++ b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
@@ -8,7 +8,7 @@
 ServerName %= @site_name %
 SSLEngine On
 SSLCertificateFile /etc/ssl/localcerts/tendril.wikimedia.org.crt
-SSLCertificateChainFile 
/etc/ssl/localcerts/tendril.wikimedia.org.chained.crt
+SSLCertificateChainFile /etc/ssl/localcerts/tendril.wikimedia.org.chain.crt
 SSLCertificateKeyFile /etc/ssl/private/tendril.wikimedia.org.key
 %= @ssl_settings.join(\n) %
 DocumentRoot %= @docroot %
diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb 
b/templates/apache/sites/wikitech.wikimedia.org.erb
index f934cd8..8f8a271 100644
--- a/templates/apache/sites/wikitech.wikimedia.org.erb
+++ b/templates/apache/sites/wikitech.wikimedia.org.erb
@@ -51,8 +51,8 @@
 
 SSLEngine on
 SSLCertificateFile /etc/ssl/localcerts/%= @certificate %.crt
+SSLCertificateChainFile /etc/ssl/localcerts/%= @certificate %.chain.crt
 SSLCertificateKeyFile /etc/ssl/private/%= @certificate %.key
-SSLCACertificatePath /etc/ssl/certs/
 %= @ssl_settings.join(\n) %
 
 RedirectMatch ^/$ https://%= @webserver_hostname %/wiki/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] chain fixes: ganglia, icinga, lists, rt, tendril, wikitech, ... - change (operations/puppet)

2015-07-07 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: chain fixes: ganglia, icinga, lists, rt, tendril, wikitech, 
gerrit
..


chain fixes: ganglia, icinga, lists, rt, tendril, wikitech, gerrit

Change-Id: Id372d6e8bc5925cfdf15dc8ee374e3df14b4eef1
---
M modules/ganglia_new/manifests/web.pp
M modules/gerrit/templates/gerrit.wikimedia.org.erb
M modules/icinga/templates/icinga.wikimedia.org.erb
M modules/mailman/templates/lists.wikimedia.org.erb
M modules/requesttracker/templates/rt4.apache.erb
M modules/tendril/templates/apache/tendril.wikimedia.org.erb
M templates/apache/sites/wikitech.wikimedia.org.erb
7 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  BBlack: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ganglia_new/manifests/web.pp 
b/modules/ganglia_new/manifests/web.pp
index f5dd092..0f56e0e 100644
--- a/modules/ganglia_new/manifests/web.pp
+++ b/modules/ganglia_new/manifests/web.pp
@@ -13,7 +13,7 @@
 $ganglia_serveralias = 'uranium.wikimedia.org'
 $ganglia_webdir = '/usr/share/ganglia-webfrontend'
 $ganglia_ssl_cert = '/etc/ssl/localcerts/ganglia.wikimedia.org.crt'
-$ganglia_ssl_chain = 
'/etc/ssl/localcerts/ganglia.wikimedia.org.chained.crt'
+$ganglia_ssl_chain = '/etc/ssl/localcerts/ganglia.wikimedia.org.chain.crt'
 $ganglia_ssl_key = '/etc/ssl/private/ganglia.wikimedia.org.key'
 $ssl_settings = ssl_ciphersuite('apache-2.4', 'compat')
 
diff --git a/modules/gerrit/templates/gerrit.wikimedia.org.erb 
b/modules/gerrit/templates/gerrit.wikimedia.org.erb
index e2f519f..a813b08 100644
--- a/modules/gerrit/templates/gerrit.wikimedia.org.erb
+++ b/modules/gerrit/templates/gerrit.wikimedia.org.erb
@@ -48,8 +48,8 @@
 
 SSLEngine on
 SSLCertificateFile /etc/ssl/localcerts/%= @ssl_cert %.crt
+SSLCertificateChainFile /etc/ssl/localcerts/%= @ssl_cert %.chain.crt
 SSLCertificateKeyFile /etc/ssl/private/%= @ssl_cert_key %.key
-SSLCACertificatePath /etc/ssl/certs/
 %= @ssl_settings.join(\n) %
 
 RedirectMatch ^/$ https://%= @host %/r/
diff --git a/modules/icinga/templates/icinga.wikimedia.org.erb 
b/modules/icinga/templates/icinga.wikimedia.org.erb
index 267b2a2..48edc5e 100644
--- a/modules/icinga/templates/icinga.wikimedia.org.erb
+++ b/modules/icinga/templates/icinga.wikimedia.org.erb
@@ -21,7 +21,7 @@
 ServerAdmin n...@wikimedia.org
 SSLEngine On
 SSLCertificateFile /etc/ssl/localcerts/icinga.wikimedia.org.crt
-SSLCertificateChainFile 
/etc/ssl/localcerts/icinga.wikimedia.org.chained.crt
+SSLCertificateChainFile /etc/ssl/localcerts/icinga.wikimedia.org.chain.crt
 SSLCertificateKeyFile /etc/ssl/private/icinga.wikimedia.org.key
 %= @ssl_settings.join(\n) %
 
diff --git a/modules/mailman/templates/lists.wikimedia.org.erb 
b/modules/mailman/templates/lists.wikimedia.org.erb
index d2f1d36..7561e52 100644
--- a/modules/mailman/templates/lists.wikimedia.org.erb
+++ b/modules/mailman/templates/lists.wikimedia.org.erb
@@ -12,8 +12,8 @@
 ServerName lists.wikimedia.org
 SSLEngine On
 SSLCertificateFile /etc/ssl/localcerts/lists.wikimedia.org.crt
+SSLCertificateChainFile /etc/ssl/localcerts/lists.wikimedia.org.chain.crt
 SSLCertificateKeyFile /etc/ssl/private/lists.wikimedia.org.key
-SSLCACertificatePath /etc/ssl/certs
 %= @ssl_settings.join(\n) %
 
 # Does not obey robots.txt; causing operational issues, 2014-06-23
diff --git a/modules/requesttracker/templates/rt4.apache.erb 
b/modules/requesttracker/templates/rt4.apache.erb
index a4875bd..fe378e1 100644
--- a/modules/requesttracker/templates/rt4.apache.erb
+++ b/modules/requesttracker/templates/rt4.apache.erb
@@ -15,8 +15,8 @@
 
   SSLEngine on
   SSLCertificateFile /etc/ssl/localcerts/rt.wikimedia.org.crt
+  SSLCertificateChainFile /etc/ssl/localcerts/rt.wikimedia.org.chain.crt
   SSLCertificateKeyFile /etc/ssl/private/rt.wikimedia.org.key
-  SSLCACertificatePath /etc/ssl/certs
   %= @ssl_settings.join(\n) %
 
   AddDefaultCharset UTF-8
diff --git a/modules/tendril/templates/apache/tendril.wikimedia.org.erb 
b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
index 334afbc..dc374db 100644
--- a/modules/tendril/templates/apache/tendril.wikimedia.org.erb
+++ b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
@@ -8,7 +8,7 @@
 ServerName %= @site_name %
 SSLEngine On
 SSLCertificateFile /etc/ssl/localcerts/tendril.wikimedia.org.crt
-SSLCertificateChainFile 
/etc/ssl/localcerts/tendril.wikimedia.org.chained.crt
+SSLCertificateChainFile /etc/ssl/localcerts/tendril.wikimedia.org.chain.crt
 SSLCertificateKeyFile /etc/ssl/private/tendril.wikimedia.org.key
 %= @ssl_settings.join(\n) %
 DocumentRoot %= @docroot %
diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb 
b/templates/apache/sites/wikitech.wikimedia.org.erb
index f934cd8..8f8a271 100644
---