diff --git a/server/go/appengine/camli/appengine/main.go b/server/go/appengine/camli/appengine/main.go index 1d3d9e003..e67acfe75 100644 --- a/server/go/appengine/camli/appengine/main.go +++ b/server/go/appengine/camli/appengine/main.go @@ -91,7 +91,6 @@ func realInit(w http.ResponseWriter, r *http.Request) bool { baseURL := fmt.Sprintf("%s://%s/", scheme, appengine.DefaultVersionHostname(ctx)) ctx.Infof("baseurl = %q", baseURL) - config.Obj["baseURL"] = baseURL root.mux = http.NewServeMux() err = config.InstallHandlers(root.mux, baseURL, r) diff --git a/server/go/appengine/config.json b/server/go/appengine/config.json index 43c7bd413..a91f0e675 100644 --- a/server/go/appengine/config.json +++ b/server/go/appengine/config.json @@ -1,13 +1,21 @@ { "_for-emacs": "-*- mode: js2;-*-", - "baseURL": "*** Populated by runtime. Ignore this.", + "handlerConfig": true, "auth": "userpass:camlistore:pass3179", "prefixes": { + "/": { + "handler": "root", + "handlerArgs": { + "ownerName": "TODO:AppEngineOwnerName", + "blobRoot": "/bs-and-maybe-also-index/", + "searchRoot": "/my-search/", + "stealth": false + } + }, + "/ui/": { "handler": "ui", "handlerArgs": { - "blobRoot": "/bs-and-maybe-also-index/", - "searchRoot": "/my-search/", "jsonSignRoot": "/sighelper/" } }, diff --git a/server/go/appengine/test-secring.gpg b/server/go/appengine/test-secring.gpg index 89f6d7497..9e35a4198 120000 --- a/server/go/appengine/test-secring.gpg +++ b/server/go/appengine/test-secring.gpg @@ -1 +1 @@ -../../../lib/go/camli/jsonsign/testdata/test-secring.gpg \ No newline at end of file +../../../pkg/jsonsign/testdata/test-secring.gpg \ No newline at end of file