X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=.htaccess;h=01d458b6aa945eeaaddc3b54c43d23719d1c63f5;hb=HEAD;hp=d773249807c5715aa765cbb81b8bf995a9c7e3ea;hpb=3258959ad59a920ba2ceba910b8da7b1100bc52a;p=dylansserver.git

diff --git a/.htaccess b/.htaccess
index d773249..01d458b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,7 +1,34 @@
 ErrorDocument 404 /404.php
+
 RewriteEngine on
-RewriteRule ^notes/? /index.php?page=1 [L]
-RewriteRule ^notes/page/? /index.php?page=1 [L]
-RewriteRule ^notes/page/([1-9]+)/?$ /index.php?page=$1 [L]
-RewriteRule ^notes/([^/\.]+)/?$ /index.php?note=$1 [L]
-RewriteRule ^([^/\.]+)/?$ /index.php?project=$1 [L]
+
+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&note=$1 [L]
+RewriteRule ^note/([^/\.]+)?/(comments/)?verify/?$ /index.php?comments=true&verify=true&note=$1 [L]
+
+RewriteRule ^notes/?$ notes/page/1
+RewriteRule ^notes/page/?$ notes/page/1
+RewriteRule ^notes/page/([0-9]+)/?$ /index.php?page=$1 [L]
+
+RewriteRule ^notes/([0-9]{4})/?$ /index.php?year=$1 [L]
+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]
+