Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master' into python

This commit is contained in:
Daniel Erat 2010-11-04 23:24:40 -07:00
parent e0b4f847c9 56ddcc2ccd
commit e39b482a42
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blobserver/go/camlistored.go
View File

@ -49,6 +49,7 @@ func handleRoot(conn http.ResponseWriter, req *http.Request) {
fmt.Fprintf(conn, "Hi.\n") fmt.Fprintf(conn, "Hi.\n")
} else { } else {
fmt.Fprintf(conn, "This is camlistored, a Camlistore storage daemon.\n"); fmt.Fprintf(conn, "This is camlistored, a Camlistore storage daemon.\n");
fmt.Fprintf(conn, "<p><a href=/js>js interface</a>");
} }
} }
@ -75,6 +76,7 @@ func main() {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.HandleFunc("/", handleRoot) mux.HandleFunc("/", handleRoot)
mux.HandleFunc("/camli/", handleCamli) mux.HandleFunc("/camli/", handleCamli)
mux.Handle("/js/", http.FileServer("../../clients/js", "/js/"))
fmt.Printf("Starting to listen on http://%v/\n", *listen) fmt.Printf("Starting to listen on http://%v/\n", *listen)
err := http.ListenAndServe(*listen, mux) err := http.ListenAndServe(*listen, mux)

2
blobserver/go/run.sh
View File

@ -2,4 +2,4 @@
mkdir /tmp/camliroot mkdir /tmp/camliroot
export CAMLI_PASSWORD=foo export CAMLI_PASSWORD=foo
make && ./camlistored make && ./camlistored "$@"