Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "pkg/serverinit: use syndtr/goleveldb in default config"

This commit is contained in:
Mathieu Lonjaret 2015-11-01 21:17:27 +00:00 committed by Gerrit Code Review
parent 7cb8884f00 69fdcbb797
commit 8efe27aa58
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/serverinit/genconfig.go
View File

@ -890,7 +890,7 @@ var defaultBaseConfig = serverconfig.Config{
// WriteDefaultConfigFile generates a new default high-level server configuration // WriteDefaultConfigFile generates a new default high-level server configuration
// file at filePath. If useSQLite, the default indexer will use SQLite, otherwise // file at filePath. If useSQLite, the default indexer will use SQLite, otherwise
// kv. If filePath already exists, it is overwritten. // leveldb. If filePath already exists, it is overwritten.
func WriteDefaultConfigFile(filePath string, useSQLite bool) error { func WriteDefaultConfigFile(filePath string, useSQLite bool) error {
conf := defaultBaseConfig conf := defaultBaseConfig
blobDir := osutil.CamliBlobRoot() blobDir := osutil.CamliBlobRoot()
@ -899,9 +899,9 @@ func WriteDefaultConfigFile(filePath string, useSQLite bool) error {
} }
conf.BlobPath = blobDir conf.BlobPath = blobDir
if useSQLite { if useSQLite {
conf.SQLite = filepath.Join(osutil.CamliVarDir(), "camli-index.db") conf.SQLite = filepath.Join(osutil.CamliVarDir(), "index.sqlite")
} else { } else {
conf.KVFile = filepath.Join(osutil.CamliVarDir(), "camli-index.kvdb") conf.LevelDB = filepath.Join(osutil.CamliVarDir(), "index.leveldb")
} }
keyID, secretRing, err := getOrMakeKeyring() keyID, secretRing, err := getOrMakeKeyring()