From 81ac8e61ec628d98166bb7869565121a53a4fd53 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 19 Mar 2012 13:49:41 -0700 Subject: [PATCH] serverconfig: don't hard-code .camli in default secring path Change-Id: Id174acaa5aa080e1c021c5032d1aa7cf45501b3e --- pkg/serverconfig/genconfig.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/serverconfig/genconfig.go b/pkg/serverconfig/genconfig.go index 1cb5fe148..da187dc89 100644 --- a/pkg/serverconfig/genconfig.go +++ b/pkg/serverconfig/genconfig.go @@ -204,7 +204,7 @@ func GenLowLevelConfig(conf *Config) (lowLevelConf *Config, err error) { } if secretRing == "" { - secretRing = filepath.Join(osutil.HomeDir(), ".camli", "secring.gpg") + secretRing = filepath.Join(osutil.CamliConfigDir(), "secring.gpg") _, err = os.Stat(secretRing) if err != nil { return nil, fmt.Errorf("\"secring\" not set in config, and no default secret ring at %s", secretRing)