Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/179077
Change subject: ganglia::web: remove ServerAlias
......................................................................
ganglia::web: remove ServerAlias
Not really needed as far as I can see; hardcodes our ganglia frontend's
hostname deep into the manifests.
Change-Id: I5648a9c067794c88940430130eac499192867ee0
---
M manifests/ganglia.pp
M templates/apache/sites/ganglia.wikimedia.org.erb
2 files changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/179077/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 5cfe7b9..df1aa8d 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -423,7 +423,6 @@
if $::realm == 'labs' {
$ganglia_servername = 'ganglia.wmflabs.org'
- $ganglia_serveralias = 'aggregator.eqiad.wmflabs'
$ganglia_webdir = '/usr/share/ganglia-webfrontend'
$ganglia_confdir = '/var/lib/ganglia/conf'
$ganglia_dwoo = '/var/lib/ganglia/dwoo'
@@ -463,7 +462,6 @@
} else {
# We are in production land
$ganglia_servername = 'ganglia.wikimedia.org'
- $ganglia_serveralias = 'uranium.wikimedia.org'
package { 'ganglia-webfrontend':
ensure => present,
diff --git a/templates/apache/sites/ganglia.wikimedia.org.erb
b/templates/apache/sites/ganglia.wikimedia.org.erb
index daadda5..0df2b65 100644
--- a/templates/apache/sites/ganglia.wikimedia.org.erb
+++ b/templates/apache/sites/ganglia.wikimedia.org.erb
@@ -1,6 +1,5 @@
<VirtualHost *:80>
ServerName <%= @ganglia_servername %>
- ServerAlias <%= @ganglia_serveralias %>
DocumentRoot /var/www
ServerAdmin [email protected]
@@ -19,7 +18,6 @@
<% if @ganglia_ssl_cert %>
<VirtualHost *:443>
ServerName <%= @ganglia_servername %>
- ServerAlias <%= @ganglia_serveralias %>
DocumentRoot /var/www
ServerAdmin [email protected]
--
To view, visit https://gerrit.wikimedia.org/r/179077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5648a9c067794c88940430130eac499192867ee0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
