Merge "serverinit: enable blobPacked in default config"

config/dev-server-config.json

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

dev/devcam/server.go

@@ -302,7 +302,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")

pkg/serverinit/genconfig.go

@@ -936,6 +936,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(), "index.sqlite")
 	} else {