[MediaWiki-commits] [Gerrit] delete old planet apache site config file - change (operations/puppet)

2013-04-19 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

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


Change subject: delete old planet apache site config file
..

delete old planet apache site config file

Change-Id: I4b133f9cee2560b781729c268e27e7acab1a9a01
---
D files/apache/sites/planet.wikimedia.org
1 file changed, 0 insertions(+), 266 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/60084/1

diff --git a/files/apache/sites/planet.wikimedia.org 
b/files/apache/sites/planet.wikimedia.org
deleted file mode 100644
index 3704063..000
--- a/files/apache/sites/planet.wikimedia.org
+++ /dev/null
@@ -1,266 +0,0 @@
-# make all planet requests go to http instead of ssl
-
-VirtualHost *:443
-   ServerName planet.wikimedia.org
-   ServerAlias planet.wikipedia.org planet.wikipedia.com 
*.planet.wikimedia.org
-   SSLEngine on
-   SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
-
-   RewriteEngine on
-   RewriteRule (.*) http://%{HTTP_HOST}%{REQUEST_URI} [R=301]
-/VirtualHost
-
-VirtualHost *:80
-   ServerName planet.wikimedia.org
-   ServerAlias planet.wikipedia.org planet.wikipedia.com
-   php_admin_flag engine off
-
-   DocumentRoot /usr/local/planet/wikimedia-portal
-
-   Directory /usr/local/planet/wikimedia-portal
-   Allow from all
-   Redirect /atom.xml http://en.planet.wikimedia.org/atom.xml
-   Redirect /rss10.xml http://en.planet.wikimedia.org/rss10.xml
-   Redirect /rss20.xml http://en.planet.wikimedia.org/rss20.xml
-   /Directory
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/ar/www
-   ServerName ar.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/ar/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/cs/www
-   ServerName cs.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/cs/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   ServerName da.planet.wikimedia.org
-   php_admin_flag engine off
-   redirectPermanent / http://gmq.planet.wikimedia.org/
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/it/www
-   ServerName it.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/it/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/de/www
-   ServerName de.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/de/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/en/www
-   ServerName en.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/en/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/es/www
-   ServerName es.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/es/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   ServerName fo.planet.wikimedia.org
-   php_admin_flag engine off
-   redirectPermanent / http://gmq.planet.wikimedia.org/
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/fr/www
-   ServerName fr.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/fr/www
-   Allow from all
-   /Directory
-

[MediaWiki-commits] [Gerrit] delete old planet apache site config file - change (operations/puppet)

2013-04-19 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: delete old planet apache site config file
..


delete old planet apache site config file

Change-Id: I4b133f9cee2560b781729c268e27e7acab1a9a01
---
D files/apache/sites/planet.wikimedia.org
1 file changed, 0 insertions(+), 266 deletions(-)

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



diff --git a/files/apache/sites/planet.wikimedia.org 
b/files/apache/sites/planet.wikimedia.org
deleted file mode 100644
index 3704063..000
--- a/files/apache/sites/planet.wikimedia.org
+++ /dev/null
@@ -1,266 +0,0 @@
-# make all planet requests go to http instead of ssl
-
-VirtualHost *:443
-   ServerName planet.wikimedia.org
-   ServerAlias planet.wikipedia.org planet.wikipedia.com 
*.planet.wikimedia.org
-   SSLEngine on
-   SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
-
-   RewriteEngine on
-   RewriteRule (.*) http://%{HTTP_HOST}%{REQUEST_URI} [R=301]
-/VirtualHost
-
-VirtualHost *:80
-   ServerName planet.wikimedia.org
-   ServerAlias planet.wikipedia.org planet.wikipedia.com
-   php_admin_flag engine off
-
-   DocumentRoot /usr/local/planet/wikimedia-portal
-
-   Directory /usr/local/planet/wikimedia-portal
-   Allow from all
-   Redirect /atom.xml http://en.planet.wikimedia.org/atom.xml
-   Redirect /rss10.xml http://en.planet.wikimedia.org/rss10.xml
-   Redirect /rss20.xml http://en.planet.wikimedia.org/rss20.xml
-   /Directory
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/ar/www
-   ServerName ar.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/ar/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/cs/www
-   ServerName cs.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/cs/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   ServerName da.planet.wikimedia.org
-   php_admin_flag engine off
-   redirectPermanent / http://gmq.planet.wikimedia.org/
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/it/www
-   ServerName it.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/it/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/de/www
-   ServerName de.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/de/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/en/www
-   ServerName en.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/en/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/es/www
-   ServerName es.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/es/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www
-   Allow from all
-   /Directory
-   Alias /shared /usr/local/planet/wikimedia/shared/www
-/VirtualHost
-
-VirtualHost *:80
-   ServerName fo.planet.wikimedia.org
-   php_admin_flag engine off
-   redirectPermanent / http://gmq.planet.wikimedia.org/
-/VirtualHost
-
-VirtualHost *:80
-   DocumentRoot /usr/local/planet/wikimedia/fr/www
-   ServerName fr.planet.wikimedia.org
-   php_admin_flag engine off
-
-   Directory /usr/local/planet/wikimedia/fr/www
-   Allow from all
-   /Directory
-   Directory /usr/local/planet/wikimedia/shared/www