From dca17552bea521fce9ce500b91595e77f4e66e5f Mon Sep 17 00:00:00 2001 From: awlx Date: Thu, 25 Feb 2016 20:26:08 +0100 Subject: Changed configuration item names --- README.md | 4 ++-- lib/oxidized/hook/githubrepo.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6b7ec87..9e9e38b 100644 --- a/README.md +++ b/README.md @@ -595,8 +595,8 @@ This hook configures the repository `remote` and _push_ the code when the specif * `remote_repo`: the remote repository to be pushed to. * `username`: username for repository auth. * `password`: password for repository auth. - * `pubkey`: publickey for repository auth. - * `privkey`: privatekey for repository auth. + * `publickey`: publickey for repository auth. + * `privatekey`: privatekey for repository auth. When using groups repositories, each group must have its own `remote` in the `remote_repo` config. diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb index a6c6807..d33e54e 100644 --- a/lib/oxidized/hook/githubrepo.rb +++ b/lib/oxidized/hook/githubrepo.rb @@ -49,9 +49,9 @@ class GithubRepo < Oxidized::Hook log "Using https auth", :debug Rugged::Credentials::UserPassword.new(username: cfg.username, password: cfg.password) else - if cfg.has_key?('pubkey') && cfg.has_key?('privkey') + 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.pubkey), privatekey: File.expand_path(cfg.privkey)) + Rugged::Credentials::SshKey.new(username: 'git', publickey: File.expand_path(cfg.publickey), privatekey: File.expand_path(cfg.privatekey)) else log "Using ssh auth with agentforwarding", :debug Rugged::Credentials::SshKeyFromAgent.new(username: 'git') -- cgit v1.2.1