From 37db1402c5c8958e320a48a437b063202afb6c94 Mon Sep 17 00:00:00 2001
From: Joachim Tingvold <joachim@tingvold.com>
Date: Tue, 5 May 2015 10:08:51 +0200
Subject: [PATCH] Minor changes.

---
 web/.htaccess         | 19 +++++++++++++++++++
 web/css/css-minify.sh |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 web/.htaccess

diff --git a/web/.htaccess b/web/.htaccess
new file mode 100644
index 0000000..2069589
--- /dev/null
+++ b/web/.htaccess
@@ -0,0 +1,19 @@
+AddOutputFilterByType DEFLATE text/text text/html text/plain text/xml text/css application/x-javascript application/javascript application/json
+
+<FilesMatch "\.(jpg|otf|ico)$">
+	Header set Cache-Control "max-age=29030400, public"
+</FilesMatch>
+<FilesMatch "\.(css|js)$">
+        Header set Cache-Control "max-age=5184000, public"
+</FilesMatch>
+<FilesMatch "index.html">
+	Header set Cache-Control "max-age=2678400, public"
+</FilesMatch>
+<FilesMatch "\.json$">
+	Header set Cache-Control "max-age=3600, public"
+</FilesMatch>
+
+<FilesMatch "Makefile">
+	deny from all
+</FilesMatch>
+
diff --git a/web/css/css-minify.sh b/web/css/css-minify.sh
index 1680350..37a60c1 100755
--- a/web/css/css-minify.sh
+++ b/web/css/css-minify.sh
@@ -8,5 +8,5 @@ ls -1 *.css|grep -Ev "min.css$" | while read cssfile; do
 done
 
 # merge all into one single file
-rm -f scripts.min.css
-cat *.min.css > scripts.min.css
+rm -f styles.min.css
+cat *.min.css > styles.min.css