From ad876efcb1e4dea52069a25246f6cc5031c54212 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Wed, 21 Aug 2013 20:04:53 -0700 Subject: [PATCH 1/3] camweb: Correct redirect URL for /gw/ Tested with: $ curl -i -L http://localhost:31798/gw/502aff1fd522c454e39a3723b596aca43d206d4e HTTP/1.1 302 Found Location: https://camlistore.googlesource.com/camlistore/+/502aff1fd522c454e39a3723b596aca43d206d4e Content-Type: text/html; charset=utf-8 Content-Length: 112 Date: Thu, 22 Aug 2013 03:05:28 GMT HTTP/1.1 200 OK Content-Type: text/html; charset=UTF-8 Cache-Control: no-cache, no-store, max-age=0, must-revalidate Pragma: no-cache Expires: Fri, 01 Jan 1990 00:00:00 GMT Date: Thu, 22 Aug 2013 03:05:28 GMT X-Content-Type-Options: nosniff X-Frame-Options: SAMEORIGIN X-XSS-Protection: 1; mode=block Server: GSE Transfer-Encoding: chunked Date: Wed, 21 Aug 2013 20:22:33 -0700 Subject: [PATCH 2/3] devcam: handle failed camlistored execution. Issue https://camlistore.org/issue/208 Change-Id: Ie5bf46d13023bc82f7e2934947393708c9308915 --- dev/devcam/server.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/devcam/server.go b/dev/devcam/server.go index 5bd2145d2..2c463671c 100644 --- a/dev/devcam/server.go +++ b/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() } From 8bf1eb8a9bc36e0cccb5466f1316b10f41909d0b Mon Sep 17 00:00:00 2001 From: Josh Huckabee Date: Thu, 22 Aug 2013 10:02:58 -0700 Subject: [PATCH 3/3] Add postgres setting to default config file. Change-Id: I45f374e61f17286f5c825ef537d052407ff1bccd --- server/camlistored/camlistored.go | 1 + 1 file changed, 1 insertion(+) diff --git a/server/camlistored/camlistored.go b/server/camlistored/camlistored.go index ed759a1f7..842f63ca6 100644 --- a/server/camlistored/camlistored.go +++ b/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"`