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

client: replace CAMLI_CLIENT_IDENTITY with CAMLI_KEYID 

And remove all mentions of CAMLI_CLIENT_IDENTITY because there isn't any
need for the both of them.

http://camlistore.org/issue/412

Change-Id: I0d6b8cff0f23738231de98171a23550d82f05fe9
This commit is contained in:
mpl 2014-03-31 16:30:54 +02:00
parent cc1bd94c22
commit e34c4bc828
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/environment-vars.txt
View File

@ -82,9 +82,10 @@ CAMLI_INCLUDE_PATH (string):
/path/1:/path/two:/some/other/path, and Windows would be C:\path\one;D:\path\2 /path/1:/path/two:/some/other/path, and Windows would be C:\path\one;D:\path\2
CAMLI_KEYID (string): CAMLI_KEYID (string):
devcam commands only, used by config/dev-server-config.json, and Optional GPG identity to use, taking precedence over config files.
config/dev-client-dir/client-config.json: public ID of the GPG key Used by devcam commands, in config/dev-server-config.json, and
to use for signing. config/dev-client-dir/client-config.json as the public ID of the GPG
key to use for signing.
CAMLI_KV_VERIFY (bool): CAMLI_KV_VERIFY (bool):
Enable all the VerifyDb* options in cznic/kv, to e.g. track down Enable all the VerifyDb* options in cznic/kv, to e.g. track down
@ -109,9 +110,6 @@ CAMLI_FAST_DEV (bool):
Used by dev/demo.sh for giving presentations with devcam server/put/etc Used by dev/demo.sh for giving presentations with devcam server/put/etc
for faster pre-built builds, without calling make.go. for faster pre-built builds, without calling make.go.
CAMLI_CLIENT_IDENTITY (string):
Optional GPG identity to use, taking precedence over config files.
CAMLI_SECRET_RING (string): CAMLI_SECRET_RING (string):
Path to the GPG secret keyring, which is otherwise set by identitySecretRing Path to the GPG secret keyring, which is otherwise set by identitySecretRing
in the server config, and secretRing in the client config. in the server config, and secretRing in the client config.

2
pkg/client/config.go
View File

@ -358,7 +358,7 @@ func (c *Client) SignerPublicKeyBlobref() blob.Ref {
} }
func (c *Client) initSignerPublicKeyBlobref() { func (c *Client) initSignerPublicKeyBlobref() {
keyId := os.Getenv("CAMLI_CLIENT_IDENTITY") keyId := os.Getenv("CAMLI_KEYID")
if keyId == "" { if keyId == "" {
configOnce.Do(parseConfig) configOnce.Do(parseConfig)
keyId = config.Identity keyId = config.Identity

2
pkg/test/world.go
View File

@ -282,7 +282,7 @@ func MustRunCmd(t *testing.T, c *exec.Cmd) string {
} }
// ClientIdentity returns the GPG identity to use in World tests, suitable // ClientIdentity returns the GPG identity to use in World tests, suitable
// for setting in CAMLI_CLIENT_IDENTITY. // for setting in CAMLI_KEYID.
func (w *World) ClientIdentity() string { func (w *World) ClientIdentity() string {
return "26F5ABDA" return "26F5ABDA"
} }