[MediaWiki-commits] [Gerrit] operations/puppet[production]: MW apache: remove bits.wm.o vhost

2016-12-07 Thread Elukey (Code Review) 
Elukey has submitted this change and it was merged.

Change subject: MW apache: remove bits.wm.o vhost
..


MW apache: remove bits.wm.o vhost

Bug: T107430
Change-Id: I93af7b2874d2636c358a64b180dc0b78a2fd5837
---
M modules/mediawiki/files/apache/sites/wikimedia.conf
1 file changed, 0 insertions(+), 19 deletions(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  Chad: Looks good to me, but someone else must approve
  Elukey: Verified; Looks good to me, approved
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  BBlack: Looks good to me, but someone else must approve



diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf 
b/modules/mediawiki/files/apache/sites/wikimedia.conf
index 2df1f70..624b2d6 100644
--- a/modules/mediawiki/files/apache/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/sites/wikimedia.conf
@@ -25,25 +25,6 @@
 Include "sites-enabled/wikimedia-legacy.incl"
 
 
-#bits
-
-ServerName bits.wikimedia.org
-DocumentRoot "/srv/mediawiki/docroot/bits/"
-
-# Version-independent aliases for backwards-compatibility
-Alias /w/extensions/ /srv/mediawiki/php/extensions/
-Alias /skins-1.5/ /srv/mediawiki/php/skins/
-Alias /skins/ /srv/mediawiki/php/skins/
-
-Alias /images/ /srv/mediawiki/images/
-
-# Handle error pages correctly if mod_php is absent
-ProxyPass  /w/404.php  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/404.php retry=0
-
-# Used for Firefox OS web application manifest living on bits.wikimedia.org
-AddType application/x-web-app-manifest+json .webapp
-
-
 # loginwiki
 
 ServerName login.wikimedia.org

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93af7b2874d2636c358a64b180dc0b78a2fd5837
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: MW apache: remove bits.wm.o vhost

2016-08-18 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: MW apache: remove bits.wm.o vhost
..

MW apache: remove bits.wm.o vhost

Bug: T107430
Change-Id: I93af7b2874d2636c358a64b180dc0b78a2fd5837
---
M modules/mediawiki/files/apache/sites/wikimedia.conf
1 file changed, 0 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/305536/1

diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf 
b/modules/mediawiki/files/apache/sites/wikimedia.conf
index 145e483..497a7f1 100644
--- a/modules/mediawiki/files/apache/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/sites/wikimedia.conf
@@ -25,25 +25,6 @@
 Include "sites-enabled/wikimedia-legacy.incl"
 
 
-#bits
-
-ServerName bits.wikimedia.org
-DocumentRoot "/srv/mediawiki/docroot/bits/"
-
-# Version-independent aliases for backwards-compatibility
-Alias /w/extensions/ /srv/mediawiki/php/extensions/
-Alias /skins-1.5/ /srv/mediawiki/php/skins/
-Alias /skins/ /srv/mediawiki/php/skins/
-
-Alias /images/ /srv/mediawiki/images/
-
-# Handle error pages correctly if mod_php is absent
-ProxyPass  /w/404.php  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/404.php retry=0
-
-# Used for Firefox OS web application manifest living on bits.wikimedia.org
-AddType application/x-web-app-manifest+json .webapp
-
-
 # loginwiki
 
 ServerName login.wikimedia.org

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93af7b2874d2636c358a64b180dc0b78a2fd5837
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 

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