update htaccess files and makefile according to new setup

[~bandali/bndl.org] / static / .htaccess

diff --git a/static/.htaccess b/static/.htaccess
index 96c757e..fe09a63 100644 (file)
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -1,9 +1,7 @@
-# www -> no-www

 <IfModule mod_rewrite.c>
 <IfModule mod_rewrite.c>

-RewriteEngine On
-RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
-RewriteRule ^ %{REQUEST_SCHEME}://%1%{REQUEST_URI} [R,L]
+# since we set Options -MultiViews in ../.htaccess, we now have to
+# explicitly tell apache that files with no extension are actually
+# .html files
+RewriteCond %{REQUEST_FILENAME}.html -f
+RewriteRule !.*\.html$ %{REQUEST_FILENAME}.html [L]

 </IfModule>
 </IfModule>

-
-# custom 404 page
-ErrorDocument 404 /404.html