Tim Starling has submitted this change and it was merged.
Change subject: Remove virtual host entries for deleted wikis
......................................................................
Remove virtual host entries for deleted wikis
strategyapps, comcom and langcom. So that their document roots can also
be deleted. Requesting them will still show a sensible error message,
from nonexistent.conf.
Change-Id: Iaa52a97bfae4c1998f1cd72fe7d48879014183a3
---
M remnant.conf
1 file changed, 0 insertions(+), 97 deletions(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/remnant.conf b/remnant.conf
index b696753..a79a743 100644
--- a/remnant.conf
+++ b/remnant.conf
@@ -816,38 +816,6 @@
</Directory>
</VirtualHost>
-# Communications committee private wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/comcom"
- ServerName comcom.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/comcom/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- <Directory "/usr/local/apache/common/docroot/comcom/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/comcom/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
# search committee private wiki
<VirtualHost *>
DocumentRoot "/usr/local/apache/common/docroot/searchcom"
@@ -980,38 +948,6 @@
</VirtualHost>
-# lang committee private wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/langcom"
- ServerName langcom.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/langcom/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- <Directory "/usr/local/apache/common/docroot/langcom/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/langcom/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
# strategy wiki
<VirtualHost *>
DocumentRoot "/usr/local/apache/common/docroot/strategy"
@@ -1043,39 +979,6 @@
</IfModule>
</Directory>
</VirtualHost>
-
-# strategy-apps wiki
-<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/strategyapps"
- ServerName strategyapps.wikimedia.org
-
- AllowEncodedSlashes On
-
- RewriteEngine On
-
- # Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/strategyapps/w/index.php
- RewriteRule ^/$ /w/index.php
-
- # UseMod compatibility URLs
- RewriteCond %{QUERY_STRING} ([^&;]+)
- RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
- RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
-
- RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
-
- <Directory "/usr/local/apache/common/docroot/strategyapps/w">
- <IfModule mod_php5.c>
- php_admin_flag engine on
- </IfModule>
- </Directory>
- <Directory "/usr/local/apache/common/docroot/strategyapps/w/extensions">
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- </Directory>
-</VirtualHost>
-
# office private wiki
<VirtualHost *>
--
To view, visit https://gerrit.wikimedia.org/r/50343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa52a97bfae4c1998f1cd72fe7d48879014183a3
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
