Dzahn has submitted this change and it was merged.

Change subject: fix atom.xml redirect on planet.wikimedia.org without language 
subdomain (bug 46721)
......................................................................


fix atom.xml redirect on planet.wikimedia.org without language subdomain (bug 
46721)

Change-Id: I34be96d863eea747ce24e0e9b7daa20953d4948f
---
M templates/apache/sites/planet.erb
1 file changed, 3 insertions(+), 6 deletions(-)

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



diff --git a/templates/apache/sites/planet.erb 
b/templates/apache/sites/planet.erb
index 7f9e9d1..e827c73 100644
--- a/templates/apache/sites/planet.erb
+++ b/templates/apache/sites/planet.erb
@@ -23,12 +23,9 @@
 
        DocumentRoot /var/www/planet
 
-       <Directory /var/www/planet>
-               Allow from all
-               Redirect /atom.xml http://en.planet.<%= planet_domain_name 
%>/atom.xml
-               Redirect /rss10.xml http://en.planet.<%= planet_domain_name 
%>/rss10.xml
-               Redirect /rss20.xml http://en.planet.<%= planet_domain_name 
%>/rss20.xml
-       </Directory>
+       Redirect /atom.xml http://en.planet.<%= planet_domain_name %>/atom.xml
+       Redirect /rss10.xml http://en.planet.<%= planet_domain_name %>/rss10.xml
+       Redirect /rss20.xml http://en.planet.<%= planet_domain_name %>/rss20.xml
 
        RedirectTemp / http://meta.wikimedia.org/wiki/Planet_Wikimedia
 </VirtualHost>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34be96d863eea747ce24e0e9b7daa20953d4948f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to