Major overhaul of rewrite rules, "main" blog now displays a "home" page.

Hopefully non-vhost install is working again.



git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@266 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 14 insertions, 74 deletions

diff --git a/htaccess.dist b/htaccess.dist
index 10927e6..37491e5 100644
--- a/htaccess.dist
+++ b/htaccess.dist
@@ -1,67 +1,6 @@
 RewriteEngine On
 RewriteBase BASE/
 
-###
-#### main blog
-###
-
-RewriteRule ^templates/(.*)				BASE/wp-inst/wp-content/blogs/main/templates/$1 [L]
-RewriteRule ^files/(.*)		  			BASE/wp-inst/wp-content/blogs/files/$1 [L]
-RewriteRule ^wp-content/themes/(.*)			BASE/wp-inst/wp-content/themes/$1 [L]
-
-# rewrite these
-RewriteRule ^category/(.*)/page/(.*)/		   	BASE/wp-inst/index.php?wpblog=main&category_name=$1&paged=$2 [L]
-RewriteRule ^category/(.*)/(feed|rdf|rss|rss2|atom)/?$  BASE/wp-inst/wp-feed.php?wpblog=main&category_name=$1&feed=$2 [L]
-RewriteRule ^category/?(.*)				BASE/wp-inst/index.php?wpblog=main&category_name=$1 [L]
-RewriteRule ^author/(.*)/(feed|rdf|rss|rss2|atom)/?$	BASE/wp-inst/wp-feed.php?wpblog=main&author_name=$1&feed=$2 [L]
-RewriteRule ^author/?(.*)				BASE/wp-inst/index.php?wpblog=main&author_name=$1 [L]
-RewriteRule ^([0-9]{4})/?([0-9]{1,2})?/?([0-9]{1,2})?/?([_0-9a-zA-Z-]+)?/?([0-9]+)?/?$	  	BASE/wp-inst/index.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4&page=$5 [L]
-RewriteRule ^([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-zA-Z-]+)/(feed|rdf|rss|rss2|atom)/?$ BASE/wp-inst/wp-feed.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4&feed=$5 [L]
-RewriteRule ^([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-zA-Z-]+)/trackback/?$		BASE/wp-inst/wp-trackback.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4 [L]
-RewriteRule ^page/?([0-9]+)?/?$ 			BASE/wp-inst/index.php?paged=$1 [L]
-RewriteRule ^feed/?([_0-9a-zA-Z-]+)?/?$		 	BASE/wp-inst/wp-feed.php?wpblog=main&feed=$1 [L]
-RewriteRule ^comments/feed/?([_0-9a-zA-Z-]+)?/?$	BASE/wp-inst/wp-feed.php?wpblog=main&feed=$1&withcomments=1 [L]
-RewriteRule ^archives/p/([0-9]+)/?(.*)?		 	BASE/wp-inst/index.php?wpblog=main&redirect=yes&p=$1 [L]
-RewriteRule ^archives/cat/([0-9]+)/?(.*)?		BASE/wp-inst/index.php?wpblog=main&redirect=yes&cat=$1 [L]
-RewriteRule ^archives/m/([0-9]+)\#?(.*)?		BASE/wp-inst/index.php?wpblog=main&redirect=yes&m=$1 [L]
-RewriteRule ^b2rss2.php(.*)?				BASE/wp-inst/wp-feed.php?wpblog=main&feed=rss2 [L]
-RewriteRule ^b2rdf.php(.*)?				BASE/wp-inst/wp-feed.php?wpblog=main&feed=rdf [L]
-
-# We want to pass these files straight through
-RewriteRule ^wp-comments-post.php(.*)  			BASE/wp-inst/wp-comments-post.php	   [L]
-RewriteRule ^go.php(.*) 				BASE/wp-inst/go.php$1 [L]
-RewriteRule ^pages/(.*) 				BASE/wp-inst/pages/$1 [L]
-RewriteRule ^wp-admin/(.*) 				BASE/wp-inst/wp-admin/$1 [L]
-RewriteRule ^wp-atom.php(.*) 				BASE/wp-inst/wp-atom.php [L]
-RewriteRule ^wp-comments-popup.php(.*) 			BASE/wp-inst/wp-comments-popup.php [L]
-RewriteRule ^wp-comments-post.php(.*) 			BASE/wp-inst/wp-comments-post.php [L]
-RewriteRule ^wp-commentsrss2.php(.*) 			BASE/wp-inst/wp-commentsrss2.php [L]
-RewriteRule ^wp-counter.php(.+)? 			BASE/wp-inst/wp-counter.php [L]
-RewriteRule ^wp-feed.php(.*) 				BASE/wp-inst/wp-feed.php [L]
-RewriteRule ^wp-images/(.*) 				BASE/wp-inst/wp-images/$1 [L]
-RewriteRule ^wp-includes/images/(.*) 			BASE/wp-inst/wp-includes/images/$1 [L]
-RewriteRule ^wp-includes/js/(.*) 			BASE/wp-inst/wp-includes/js/$1 [L]
-RewriteRule ^wp-links-opml.php(.*) 			BASE/wp-inst/wp-links-opml.php [L]
-RewriteRule ^wp-login.php(.*) 				BASE/wp-inst/wp-login.php [L]
-RewriteRule ^wp-mail.php(.*)	 			BASE/wp-inst/wp-mail.php [L]
-RewriteRule ^wp-pass.php(.*) 				BASE/wp-inst/wp-pass.php [L]
-RewriteRule ^wp-rdf.php(.*) 				BASE/wp-inst/wp-rdf.php [L]
-RewriteRule ^wp-register.php(.*) 			BASE/wp-inst/wp-register.php [L]
-RewriteRule ^wp-rss.php(.*)	 			BASE/wp-inst/wp-rss.php [L]
-RewriteRule ^wp-rss2.php(.*) 				BASE/wp-inst/wp-rss2.php [L]
-RewriteRule ^wp-sidebar.php(.*) 			BASE/wp-inst/wp-sidebar.php [L]
-RewriteRule ^wp-trackback.php(.*) 			BASE/wp-inst/wp-trackback.php [L]
-RewriteRule ^xmlrpc.php(.*) 				BASE/wp-inst/xmlrpc.php [L]   
-RewriteRule ^maintenance.php 				BASE/wp-inst/maintenance.php [L]   
-RewriteRule ^favicon.ico				/wp-inst/favicon.ico [L]
-RewriteRule ^robots.txt 				/wp-inst/robots.txt [L]
-
-RewriteRule ^wp-newblog.php				BASE/wp-inst/wp-newblog.php [L]
-RewriteRule ^signup/					BASE/wp-inst/wp-newblog.php [L]
-RewriteRule ^invite/(.*)/?				BASE/wp-inst/wp-newblog.php?u=$1 [L]
-RewriteRule ^index.php					BASE/wp-inst/index.php [L]
-
-RewriteRule ^$ BASE/wp-inst/index.php [L]
 
 ###
 #### blogs
@@ -70,6 +9,7 @@ RewriteRule ^([_0-9a-zA-Z-]+)/templates/(.*)			BASE/wp-inst/wp-content/blogs/$1/
 RewriteRule ^([_0-9a-zA-Z-]+)/files/(.*)			BASE/wp-inst/wp-content/blogs/$1/files/$2 [L]
 RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/blogs/(.*)/files/(.*)	BASE/wp-inst/wp-content/blogs/$1/files/$3 [L]
 RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/themes/(.*)		BASE/wp-inst/wp-content/themes/$2 [L]
+RewriteRule ^wp-content/themes/(.*)		BASE/wp-inst/wp-content/themes/$1 [L]
 
 # rewrite these
 RewriteRule ^([_0-9a-zA-Z-]+)/category/(.*)/page/(.*)/			BASE/wp-inst/index.php?wpblog=$1&category_name=$2&paged=$3 [L]
@@ -113,23 +53,23 @@ RewriteRule ^([_0-9a-zA-Z-]+)/wp-sidebar.php(.*) 		BASE/wp-inst/wp-sidebar.php [
 RewriteRule ^([_0-9a-zA-Z-]+)/wp-trackback.php(.*) 		BASE/wp-inst/wp-trackback.php [L]
 RewriteRule ^([_0-9a-zA-Z-]+)/xmlrpc.php(.*) 			BASE/wp-inst/xmlrpc.php [L]   
 RewriteRule ^([_0-9a-zA-Z-]+)/maintenance.php 			BASE/wp-inst/maintenance.php [L]   
-RewriteRule ^([_0-9a-zA-Z-]+)/favicon.ico 			/wp-inst/favicon.ico [L]   
+RewriteRule ^([_0-9a-zA-Z-]+)/favicon.ico 			BASE/wp-inst/favicon.ico [L]   
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-includes/images/(.*) 		BASE/wp-inst/wp-includes/images/$2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-includes/js/(.*) 		BASE/wp-inst/wp-includes/js/$2 [L]
 
-# pages
-RewriteCond REALPATH/wp-inst/wp-content/blogs/%{1} -d
-RewriteRule ^([_0-9a-zA-Z-]+)/(.*)/$				BASE/wp-inst/index.php?pagename=$2 [L]
+RewriteRule ^wp-newblog.php$ 					BASE/wp-inst/wp-newblog.php [L]
+RewriteRule ^wp-login.php 					BASE/wp-inst/wp-login.php [L]
+RewriteRule ^wp-admin/(.*) 					BASE/wp-inst/wp-admin/$1 [L]
+RewriteRule ^wp-includes/images/(.*) 				BASE/wp-inst/wp-includes/images/$1 [L]
+RewriteRule ^wp-includes/js/(.*) 				BASE/wp-inst/wp-includes/js/$1 [L]
+RewriteRule ^signup/						BASE/wp-inst/wp-newblog.php [L]
+RewriteRule ^invite/(.*)/?					BASE/wp-inst/wp-newblog.php?u=$1 [L]
+RewriteRule ^index.php						BASE/wp-inst/index.php [L]
 
-RewriteRule ^(.*)/$						BASE/wp-inst/index.php?pagename=$1 [L]
+RewriteRule ^$ 							BASE/wp-inst/index.php [L]
 
 # catch all rules
-RewriteCond REALPATH/wp-inst/wp-content/blogs/%{1} -d
 RewriteRule ^([_0-9a-zA-Z-]+)/					BASE/wp-inst/index.php [L]
-
-RewriteRule ^([_0-9a-zA-Z-]+)/(.+)$ BASE/wp-inst/$2 [L]
-
-RewriteCond %{REQUEST_FILENAME}  -d
-RewriteRule ^(.+[^/])$						BASE/ [R,L]
-RewriteCond REALPATH/wp-inst/wp-content/blogs/%{1} -d
-RewriteRule ^(.*[^/])$						BASE/$1/ [R,L]
+RewriteRule ^([_0-9a-zA-Z-]+)					$1/ [R,L]
 
 AddType text/css .css