From: Michael Andreen <harv@ruin.nu>
Date: Sat, 22 Aug 2009 13:04:21 +0000 (+0200)
Subject: Move favicon to static, so expire headers are set
X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=commitdiff_plain;h=68829839b9031bf91844f5d5a3b516792bf1697f

Move favicon to static, so expire headers are set
---

diff --git a/apache-conf.conf b/apache-conf.conf
index 4c21de9..f00ba42 100644
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -24,7 +24,6 @@
 	</IfModule>
 
 	Alias /static /var/www/ndawn/root/static
-	Alias /favicon.ico /var/www/ndawn/root/favicon.ico
 	Alias /robots.txt /var/www/ndawn/root/robots.txt
 
 	FastCgiExternalServer /tmp/ndwebpub.fcgi -socket /tmp/ndweb.socket
@@ -93,7 +92,6 @@ NameVirtualHost *:443
 	</IfModule>
 
 	Alias /static /var/www/ndawn/root/static
-	Alias /favicon.ico /var/www/ndawn/root/favicon.ico
 	Alias /robots.txt /var/www/ndawn/root/robots.txt
 
 	FastCgiExternalServer /tmp/ndweb.fcgi -socket /tmp/ndweb.socket
diff --git a/root/lib/site/html.tt2 b/root/lib/site/html.tt2
index acea5d6..5ece0ac 100644
--- a/root/lib/site/html.tt2
+++ b/root/lib/site/html.tt2
@@ -8,7 +8,7 @@
 [%- FOR s IN site.stylesheets %]
 	<link rel="stylesheet" type="text/css" href="/static/[% s %]">
 [%- END %]
-	<link rel="icon" type="image/ico" href="/favicon.ico">
+	<link rel="icon" type="image/ico" href="/static/favicon.ico">
 	<script type="text/javascript" src="/static/js/raid.js"></script>
 	<script type="text/javascript" src="/static/js/jquery-1.3.2.min.js"></script>
 </head>