From 00db26d3afc23816acc3fcf47dcca3905e68435f Mon Sep 17 00:00:00 2001
From: Mark Pilgrim <mark@diveintomark.org>
Date: Tue, 30 Jun 2009 11:06:05 -0400
Subject: [PATCH] htaccess fiddling

---
 .htaccess   | 3 +++
 i/.htaccess | 2 ++
 publish     | 5 +++--
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .htaccess

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..45e0e65
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,3 @@
+FileETag MTime Size
+
+SetEnvIfNoCase Request_URI \.html$ dont-vary
diff --git a/i/.htaccess b/i/.htaccess
index e49b755..35a1445 100644
--- a/i/.htaccess
+++ b/i/.htaccess
@@ -1,2 +1,4 @@
+FileETag MTime Size
+
 ExpiresActive On
 ExpiresDefault "access plus 1 year"
diff --git a/publish b/publish
index 14dd54f..e2bc2b6 100755
--- a/publish
+++ b/publish
@@ -10,6 +10,7 @@ cp -R j build/
 cp -R i build/
 rm -f examples/*.pyc
 cp -R examples build/
+cp .htaccess build/
 
 echo "minimizing HTML"
 
@@ -70,10 +71,10 @@ sed -i -e "s|href=index.html|href=/|g" build/*.html
 
 # set file permissions (hg resets these, don't know why)
 chmod 755 build/j build/i
-chmod 644 build/*.html build/*.css build/examples/*.py build/examples/*.txt build/*.txt build/j/*.js build/j/.htaccess build/i/* build/i/.htaccess
+chmod 644 build/*.html build/*.css build/examples/*.py build/examples/*.txt build/*.txt build/j/*.js build/j/.htaccess build/i/* build/i/.htaccess build/.htaccess
 
 # ship it!
 echo "publishing"
 rsync -essh -avz build/i/* build/i/.htaccess diveintomark.org:~/web/wearehugh.com/dip3/
 rsync -essh -avz build/j/$revision.js build/j/html5.js build/j/.htaccess diveintomark.org:~/web/diveintopython3.org/j/
-rsync -essh -avz build/examples build/*.txt build/*.html diveintomark.org:~/web/diveintopython3.org/
+rsync -essh -avz build/examples build/*.txt build/*.html build/.htaccess diveintomark.org:~/web/diveintopython3.org/