Permalink
Browse files

merged in branch 'master' from ../akelos_2/

  • Loading branch information...
2 parents 152a9f3 + 964bdc4 commit 8dbf19e5db079edd5385b117617e020f051097df @bermi bermi committed Dec 7, 2009
Showing 1,338 changed files with 281,259 additions and 49 deletions.
View
@@ -0,0 +1,10 @@
+config/database.yml
+config/sqlite.yml
+config/mysql.yml
+config/testconfig1.yml
+config/plugin_repositories.txt
+app/locales/
+cache/
+test/_fixtures/
+nbproject/
+docs/akelos/doc.sqlite
View
@@ -1,51 +1,5 @@
-DirectoryIndex index.php
-
-<IfModule sapi_apache2.c>
- php_value register_globals 0
- php_value magic_quotes_gpc 0
- php_value magic_quotes_runtime 0
- php_value magic_quotes_sybase 0
- php_value arg_separator.output "&"
- php_value default_charset "utf-8"
- php_value session.name "AK_SESSID"
-</IfModule>
-
-<IfModule mod_php4.c>
- php_value register_globals 0
- php_value magic_quotes_gpc 0
- php_value magic_quotes_runtime 0
- php_value magic_quotes_sybase 0
- php_value arg_separator.output "&"
- php_value default_charset "utf-8"
- php_value session.name "AK_SESSID"
-</IfModule>
-
-# On some servers this directive might be needed
-# Options +FollowSymLinks
-
-# Various rewrite rules
<IfModule mod_rewrite.c>
- RewriteEngine on
-
- # If your Akelos Framework application is accessed via an Alias directive,
- # then you MUST also set the RewriteBase in this htaccess file.
- #
- # Example:
- # Alias /myakelosapp /path/to/myakelosapp/public
- # RewriteBase /framework
-
- # If you don't want The Akelos Framework to look in certain directories,
- # use the following rewrite rules so that Apache won't rewrite certain requests
- #
- # Example:
- # RewriteCond %{REQUEST_URI} ^/notakelos.*
- # RewriteRule .* - [L]
-
-
- # Rewrite URLs of the form 'index.php?ak=x':
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule ^(.*)$ index.php?ak=$1 [L,QSA]
+ RewriteEngine on
+ RewriteRule ^$ public/ [L]
+ RewriteRule (.*) public/$1 [L]
</IfModule>
-
-ErrorDocument 500 "<h2>Apache server error</h2>Akelos application failed to start properly"
Oops, something went wrong.

0 comments on commit 8dbf19e

Please sign in to comment.