Merge branch 'master' of https://camlistore.googlesource.com/camlistore

dev/devcam/server.go

@@ -364,6 +364,5 @@ func (c *serverCmd) RunCommand(args []string) error {
 		return fmt.Errorf("Could not start camlistored: %v", err)
 	}
 	go handleSignals(cmd.Process)
-	cmd.Wait()
-	return nil
+	return cmd.Wait()
 }

server/camlistored/camlistored.go

@@ -217,6 +217,7 @@ type defaultConfigFile struct {
 	BlobPath           string        `json:"blobPath"`
 	MySQL              string        `json:"mysql"`
 	Mongo              string        `json:"mongo"`
+	Postgres           string        `json:"postgres"`
 	SQLite             string        `json:"sqlite"`
 	S3                 string        `json:"s3"`
 	ReplicateTo        []interface{} `json:"replicateTo"`

website/camweb.go

@@ -188,7 +188,7 @@ func mainHandler(rw http.ResponseWriter, req *http.Request) {
 
 	if strings.HasPrefix(relPath, "gw/") {
 		path := relPath[3:]
-		http.Redirect(rw, req, "https://camlistore.googlesource.com/camlistore/+/HEAD/"+path, http.StatusFound)
+		http.Redirect(rw, req, "https://camlistore.googlesource.com/camlistore/+/"+path, http.StatusFound)
 		return
 	}