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

Remove authkey usage 

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
This commit is contained in:
Riyaz Faizullabhoy 2016-04-05 16:48:42 -07:00
parent 66d6b347d8
commit 67d1847cb3
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/notary-server/config.go
View File

@ -90,7 +90,7 @@ func getStore(configuration *viper.Viper, hRegister healthRegister) (
if err != nil {
return nil, err
}
sess, err = rethinkdb.Connection(storeConfig.CA, storeConfig.Source, storeConfig.AuthKey)
sess, err = rethinkdb.Connection(storeConfig.CA, storeConfig.Source)
if err == nil {
s := storage.NewRethinkDBStorage(storeConfig.DBName, sess)
store = *storage.NewTufMetaStorage(s)

2
cmd/notary-signer/main.go
View File

@ -93,7 +93,7 @@ func setUpCryptoservices(configuration *viper.Viper, allowedBackends []string) (
if err != nil {
return nil, err
}
sess, err = rethinkdb.Connection(storeConfig.CA, storeConfig.Source, storeConfig.AuthKey)
sess, err = rethinkdb.Connection(storeConfig.CA, storeConfig.Source)
if err == nil {
defaultAlias := configuration.GetString("storage.default_alias")
if defaultAlias == "" {

5
storage/rethinkdb/rethinkdb.go
View File

@ -18,8 +18,8 @@ type Timing struct {
}
// Connection sets up a RethinkDB connection to the host (`host:port` format)
// using the CA .pem file provided at path `caFile` and the authKey
func Connection(caFile, host, authKey string) (*gorethink.Session, error) {
// using the CA .pem file provided at path `caFile`
func Connection(caFile, host string) (*gorethink.Session, error) {
tlsOpts := tlsconfig.Options{
CAFile: caFile,
}
@ -30,7 +30,6 @@ func Connection(caFile, host, authKey string) (*gorethink.Session, error) {
return gorethink.Connect(
gorethink.ConnectOpts{
Address: host,
AuthKey: authKey,
TLSConfig: t,
},
)