From f7ae0f8edfb2afded6b4fdbf40f5db02d7423cad Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Sun, 23 Jan 2011 21:52:14 -0800
Subject: [PATCH] Give up and put favicon.ico at the root.

---
 website/camweb.go      | 1 +
 website/tmpl/page.html | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/website/camweb.go b/website/camweb.go
index 580f97d4f..0e6e47e71 100644
--- a/website/camweb.go
+++ b/website/camweb.go
@@ -159,6 +159,7 @@ func main() {
 	readTemplates()
 
 	mux := http.DefaultServeMux
+	mux.Handle("/favicon.ico", http.FileServer(path.Join(*root, "static"), "/"))
 	mux.Handle("/static/", http.FileServer(path.Join(*root, "static"), "/static/"))
 	mux.HandleFunc("/", mainHandler)
 
diff --git a/website/tmpl/page.html b/website/tmpl/page.html
index bb57d7293..65e15dd12 100644
--- a/website/tmpl/page.html
+++ b/website/tmpl/page.html
@@ -6,8 +6,6 @@
 {.or}
   <title>Camlistore</title>
 {.end}
-<link rel="icon" href="/static/favicon.ico" type="image/x-icon">
-<link rel="shortcut icon" href="/static/favicon.ico" type="image/x-icon">
 <link href='http://fonts.googleapis.com/css?family=Droid+Sans:regular,bold' rel='stylesheet' type='text/css'>
 <link rel="stylesheet" href="/static/all.css" type="text/css" media="all" charset="utf-8">
 </head>