update htaccess files and makefile according to new setup

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

diff --git a/static/.htaccess b/static/.htaccess
index 4f38f87..fe09a63 100644 (file)
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -1,15 +1,7 @@
 <IfModule mod_rewrite.c>
-# don't add .html in the rewrite below
-Options -MultiViews
-
-RewriteEngine On
-RewriteBase /
-# if not already on bandali.eu.org, redirect to there
-RewriteCond %{HTTP_HOST} !^bandali\.eu\.org$
-RewriteRule ^(.*)$ https://bandali.eu.org/$1 [R]
-
-# now we have to explicitly tell apache that files with no
-# extension are actually .html
+# 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>