X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=.htaccess;h=01d458b6aa945eeaaddc3b54c43d23719d1c63f5;hb=HEAD;hp=f2421fc518f99f0671e0efd1b49d338012c11c3c;hpb=f870b65ad60d8ea7456384d38f8db6fd01275990;p=dylansserver.git diff --git a/.htaccess b/.htaccess index f2421fc..01d458b 100644 --- a/.htaccess +++ b/.htaccess @@ -1,9 +1,25 @@ ErrorDocument 404 /404.php - RewriteEngine on +RewriteCond %{HTTPS} off +RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} + +RewriteRule ^analytics$ /piwik [L] +RewriteRule ^id$ /id_rsa.pub [L] +RewriteRule ^pubkey.pgp.asc$ /dylan@dylansserver.com.pubkey.asc [L] +RewriteRule ^cellular-automata/?$ /cellular-automata/index.php [L] +RewriteRule ^resume/?$ /resume.pdf [L] + +RewriteRule ^notes/rss/?$ /index.php?rss=true [L] + +RewriteRule ^git/?$ /git/gitweb.cgi%{REQUESTURI} [L] + +RewriteRule ^captcha/?$ /index.php [L] + RewriteRule ^note/([^/\.]+)?/?$ /index.php?note=$1 [L] +RewriteRule ^note/([^/\.]+)?/comments/?$ /index.php?comments=true¬e=$1 [L] +RewriteRule ^note/([^/\.]+)?/(comments/)?verify/?$ /index.php?comments=true&verify=true¬e=$1 [L] RewriteRule ^notes/?$ notes/page/1 RewriteRule ^notes/page/?$ notes/page/1 @@ -14,5 +30,5 @@ RewriteRule ^notes/([0-9]{4})/([0-9]{2})/?$ /index.php?year=$1&month=$2 [L] RewriteRule ^notes/([0-9]{4})/([0-9]{2})/([0-9]{2})/?$ /index.php?year=$1&month=$2&day=$3 [L] ## This needs to be last as to avoid catching /notes/ etc. -RewriteRule ^([^/\.]+)/?$ /index.php?project=$1 [L] +#RewriteRule ^([^/\.]+)$ /index.php?project=$1 [L]