diff options
| author | Niall Sheridan <nsheridan@gmail.com> | 2016-06-06 13:49:21 +0100 |
|---|---|---|
| committer | Niall Sheridan <nsheridan@gmail.com> | 2016-06-06 13:49:21 +0100 |
| commit | 5ca59399fe0880368f88d17c0c9d781d836969c6 (patch) | |
| tree | fe9eaea4ae4da974a237dd6f004fe3bad272eda1 /server/signer/signer.go | |
| parent | 5166bbbf3e084f7b6ab9034f2f7590c1031bc266 (diff) | |
| parent | b8af9fe60f27353bdd5933ed37508b30d4290046 (diff) | |
Merge pull request #16 from nsheridan/s3
Add AWS S3 and Google GCS virtual filesystems
Diffstat (limited to 'server/signer/signer.go')
| -rw-r--r-- | server/signer/signer.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/server/signer/signer.go b/server/signer/signer.go index 8be5cad..1be6d75 100644 --- a/server/signer/signer.go +++ b/server/signer/signer.go @@ -4,11 +4,13 @@ import ( "crypto/md5" "crypto/rand" "fmt" - "io/ioutil" "log" "strings" "time" + "go4.org/wkfs" + _ "go4.org/wkfs/gcs" // Register "/gcs/" as a wkfs. + "github.com/nsheridan/cashier/lib" "github.com/nsheridan/cashier/server/config" "golang.org/x/crypto/ssh" @@ -71,7 +73,7 @@ func makeperms(perms []string) map[string]string { // New creates a new KeySigner from the supplied configuration. func New(conf config.SSH) (*KeySigner, error) { - data, err := ioutil.ReadFile(conf.SigningKey) + data, err := wkfs.ReadFile(conf.SigningKey) if err != nil { return nil, fmt.Errorf("unable to read CA key %s: %v", conf.SigningKey, err) } |