From 1804b7406743f8aac76351170c66f468f8d7ca97 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Sun, 5 Sep 2010 22:13:30 +0200
Subject: [PATCH] Update default .htaccess to match standard use case
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Blogs are http://<group>.polytechnique.org, not
http://farm.blog-x.org/<group> => set up a .htaccess which won't
break...

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 createBlog.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/createBlog.sh b/createBlog.sh
index 4b6c25d..00bdec7 100755
--- a/createBlog.sh
+++ b/createBlog.sh
@@ -9,11 +9,11 @@
 # owner = name of the owner
 #     * user blog: forlife of the owner of the blog
 #     * group blog: 'diminutif' of the group (from X.net database)
-# baseurl = base url of the blog.
+# url = full url of the blog (e.g http://group.blog-x.org/).
 
 # WARNING: The script generates a .htaccess. The rewrite base might be edited to match
 #         the installation. Default value is based on a blog-farm of the form
-#         http://base.url/$owner/
+#         http://$owner.base.url/
 
 # Once the blog has been installed and the .htaccess set-up, you can go on the administration
 # page of the blog at baseurl/admin/
@@ -50,7 +50,7 @@ ln -s $rootpath/$templatepath/public/$owner public
 
 ( cat <<EOF
 RewriteEngine On
-RewriteBase $baseurl/$owner
+RewriteBase $baseurl
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule (.*) index.php/\$1
-- 
2.1.4