Move favicon to static, so expire headers are set

diff --git a/apache-conf.conf b/apache-conf.conf
index 4c21de9a6bc84d90a1378bef9d88c229157258b0..f00ba42c257f8e7f5df8cc3feb2d5b3b0d39bab8 100644 (file)
--- 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 acea5d6d7b32fbee9c61c3d9a6482e47c5032ce4..5ece0acdd96bdb58840f79cb8c44c69401318819 100644 (file)
--- 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>