serverinit: enable blobPacked in default config

Also, devcam server: make loose blobs location consistent with
location on production server.

Change-Id: Ib4314f4b736595c071e710792d2e8ecacebf3a14
This commit is contained in:
mpl 2015-07-23 16:43:03 +02:00
parent e12d2aa765
commit 66a5a6176f
3 changed files with 2 additions and 2 deletions

View File

@ -136,7 +136,7 @@
"/bs-loose/": {
"handler": "storage-filesystem",
"handlerArgs": {
"path": ["_env", "${CAMLI_ROOT}/loose"]
"path": ["_env", "${CAMLI_ROOT}"]
}
},

View File

@ -292,7 +292,6 @@ func (c *serverCmd) setEnvVars() error {
setenv(k, v)
}
c.makeSuffixdir(filepath.Join(fullSuffix("bs"), "packed"))
c.makeSuffixdir(filepath.Join(fullSuffix("bs"), "loose"))
setenv("CAMLI_PORT", c.port)
if c.flickrAPIKey != "" {
setenv("CAMLI_FLICKR_ENABLED", "true")

View File

@ -867,6 +867,7 @@ func WriteDefaultConfigFile(filePath string, useSQLite bool) error {
return fmt.Errorf("Could not create default blobs directory: %v", err)
}
conf.BlobPath = blobDir
conf.PackRelated = true
if useSQLite {
conf.SQLite = filepath.Join(osutil.CamliVarDir(), "camli-index.db")
} else {