diff options
| author | Charlie Allom <yeled@github.com> | 2018-03-12 15:23:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 15:23:53 -0400 |
| commit | 46904076bcdfed94db5b0932f378442a348eea08 (patch) | |
| tree | 2e36910921d18a63723f832d198323b02f1d542c /lib/oxidized | |
| parent | 3457db1f8a454a5a62fec04510e244274d92a667 (diff) | |
| parent | e7c002423c44bba0e05ebb3c3cad4250c161736c (diff) | |
Merge pull request #1208 from wk/ssh-key-passphrase
Introduce support for OXIDIZED_SSH_PASSPHRASE for githubrepo hook
Diffstat (limited to 'lib/oxidized')
| -rw-r--r-- | lib/oxidized/hook/githubrepo.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb index d33e54e..f74b22a 100644 --- a/lib/oxidized/hook/githubrepo.rb +++ b/lib/oxidized/hook/githubrepo.rb @@ -51,7 +51,7 @@ class GithubRepo < Oxidized::Hook else if cfg.has_key?('publickey') && cfg.has_key?('privatekey') log "Using ssh auth with key", :debug - Rugged::Credentials::SshKey.new(username: 'git', publickey: File.expand_path(cfg.publickey), privatekey: File.expand_path(cfg.privatekey)) + Rugged::Credentials::SshKey.new(username: 'git', publickey: File.expand_path(cfg.publickey), privatekey: File.expand_path(cfg.privatekey), passphrase: ENV["OXIDIZED_SSH_PASSPHRASE"]) else log "Using ssh auth with agentforwarding", :debug Rugged::Credentials::SshKeyFromAgent.new(username: 'git') |