[MediaWiki-commits] [Gerrit] Remove unused ganglia.wikimedia.org.erb template - change (operations/puppet)

2015-05-06 Thread Alexandros Kosiaris (Code Review)
Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Remove unused ganglia.wikimedia.org.erb template
..

Remove unused ganglia.wikimedia.org.erb template

This is no longer used, remove

Change-Id: Ia87df1972f662411f2ae7e431f757b0728c5135c
---
D templates/apache/sites/ganglia.wikimedia.org.erb
1 file changed, 0 insertions(+), 53 deletions(-)


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

diff --git a/templates/apache/sites/ganglia.wikimedia.org.erb 
b/templates/apache/sites/ganglia.wikimedia.org.erb
deleted file mode 100644
index ac9d900..000
--- a/templates/apache/sites/ganglia.wikimedia.org.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-VirtualHost *:80
-ServerName %= @ganglia_servername %
-ServerAlias %= @ganglia_serveralias %
-DocumentRoot /var/www
-ServerAdmin n...@wikimedia.org
-
-Directory /var/www
-Options FollowSymLinks
-AllowOverride None
-% if @is_trusty %
-Require all granted
-% else %
-Order allow,deny
-Allow from all
-% end %
-/Directory
-
-Alias /latest %= @ganglia_webdir %
-
-RedirectMatch ^/$ http://%= @ganglia_servername %/latest
-ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log
-LogLevel warn
-/VirtualHost
-% if @ganglia_ssl_cert %
-VirtualHost *:443
-ServerName %= @ganglia_servername %
-ServerAlias %= @ganglia_serveralias %
-DocumentRoot /var/www
-ServerAdmin n...@wikimedia.org
-
-SSLEngine on
-SSLCertificateFile %= @ganglia_ssl_cert %
-SSLCertificateKeyFile %= @ganglia_ssl_key %
-%= @ssl_settings.join(\n) %
-
-Directory /var/www
-Options FollowSymLinks
-AllowOverride None
-% if @is_trusty %
-Require all granted
-% else %
-Order allow,deny
-Allow from all
-% end %
-/Directory
-
-Alias /latest %= @ganglia_webdir %
-
-RedirectMatch ^/$ https://%= @ganglia_servername %/latest
-ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log
-LogLevel warn
-/VirtualHost
-% end %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia87df1972f662411f2ae7e431f757b0728c5135c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Remove unused ganglia.wikimedia.org.erb template - change (operations/puppet)

2015-05-06 Thread Alexandros Kosiaris (Code Review)
Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Remove unused ganglia.wikimedia.org.erb template
..


Remove unused ganglia.wikimedia.org.erb template

This is no longer used, remove

Change-Id: Ia87df1972f662411f2ae7e431f757b0728c5135c
---
D templates/apache/sites/ganglia.wikimedia.org.erb
1 file changed, 0 insertions(+), 53 deletions(-)

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



diff --git a/templates/apache/sites/ganglia.wikimedia.org.erb 
b/templates/apache/sites/ganglia.wikimedia.org.erb
deleted file mode 100644
index ac9d900..000
--- a/templates/apache/sites/ganglia.wikimedia.org.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-VirtualHost *:80
-ServerName %= @ganglia_servername %
-ServerAlias %= @ganglia_serveralias %
-DocumentRoot /var/www
-ServerAdmin n...@wikimedia.org
-
-Directory /var/www
-Options FollowSymLinks
-AllowOverride None
-% if @is_trusty %
-Require all granted
-% else %
-Order allow,deny
-Allow from all
-% end %
-/Directory
-
-Alias /latest %= @ganglia_webdir %
-
-RedirectMatch ^/$ http://%= @ganglia_servername %/latest
-ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log
-LogLevel warn
-/VirtualHost
-% if @ganglia_ssl_cert %
-VirtualHost *:443
-ServerName %= @ganglia_servername %
-ServerAlias %= @ganglia_serveralias %
-DocumentRoot /var/www
-ServerAdmin n...@wikimedia.org
-
-SSLEngine on
-SSLCertificateFile %= @ganglia_ssl_cert %
-SSLCertificateKeyFile %= @ganglia_ssl_key %
-%= @ssl_settings.join(\n) %
-
-Directory /var/www
-Options FollowSymLinks
-AllowOverride None
-% if @is_trusty %
-Require all granted
-% else %
-Order allow,deny
-Allow from all
-% end %
-/Directory
-
-Alias /latest %= @ganglia_webdir %
-
-RedirectMatch ^/$ https://%= @ganglia_servername %/latest
-ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log
-LogLevel warn
-/VirtualHost
-% end %

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia87df1972f662411f2ae7e431f757b0728c5135c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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