disinclined.org
/
git
/
dylansserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev' into live
[dylansserver.git]
/
.htaccess
diff --git
a/.htaccess
b/.htaccess
index
65a86c7
..
dc5f0ab
100644
(file)
--- a/
.htaccess
+++ b/
.htaccess
@@
-3,9
+3,17
@@
ErrorDocument 404 /404.php
RewriteEngine on
RewriteEngine on
-RewriteRule ^([^/\.]+)/?$ /index.php?project=$1 [L]
+RewriteRule ^resume$ /res.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/([^/\.]+)?/?$ /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
RewriteRule ^notes/?$ notes/page/1
RewriteRule ^notes/page/?$ notes/page/1
@@
-14,3
+22,7
@@
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]
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]
+