Dzahn has submitted this change and it was merged.

Change subject: Tidy up foundation.conf, removing old/commented/un-needed config
......................................................................


Tidy up foundation.conf, removing old/commented/un-needed config

Change-Id: I9bae168693418cf6a424f0945e4a1bd5e0e0b19e
---
M foundation.conf
1 file changed, 0 insertions(+), 16 deletions(-)

Approvals:
  Reedy: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/foundation.conf b/foundation.conf
index ca63e92..cc350b8 100644
--- a/foundation.conf
+++ b/foundation.conf
@@ -4,10 +4,6 @@
 
     AllowEncodedSlashes On
 
-    # Some additional CGI scripts for donation tracking...
-    #ScriptAlias /cgi-bin/ "/home/wikipedia/cgi-bin/wikimediafoundation.org/"
-    ScriptAlias /cgi-bin/ 
"/usr/local/apache/common-local/cgi-bin/wikimediafoundation.org/"
-
     RewriteEngine On
 
     # extract.php pages redirected to new pages
@@ -18,13 +14,6 @@
     # Obsolete PDF redirected to current wiki page
     # Redirect added -- bv 2009-01-09
     RewriteRule ^/bylaws\.pdf 
http://wikimediafoundation.org/wiki/Wikimedia_Foundation_bylaws [R,L]
-
-    #RewriteRule ^/fr/(.*)$ /extract_fr.php?title=$1 [L]
-
-    <Directory "/usr/local/apache/common/docroot/foundation">
-        # FIXME this is dangerous
-        php_admin_flag engine on
-    </Directory>
 
     # Primary wiki redirector:
     Alias /wiki /usr/local/apache/common/docroot/foundation/w/index.php
@@ -51,11 +40,6 @@
         <IfModule mod_php5.c>
             php_admin_flag engine off
         </IfModule>
-    </Directory>
-
-    <Directory "/usr/local/apache/common/docroot/foundation/upload">
-        Options Indexes FollowSymlinks FollowSymlinks
-        AddType text/plain .html .htm .shtml
     </Directory>
 </VirtualHost>
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bae168693418cf6a424f0945e4a1bd5e0e0b19e
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to