diff options
| author | David Schmitt <david.schmitt@puppetlabs.com> | 2015-09-01 11:24:18 +0100 |
|---|---|---|
| committer | David Schmitt <david.schmitt@puppetlabs.com> | 2015-09-01 11:24:18 +0100 |
| commit | a39349a4388cd56aad5cfc8eead2f2a17f545287 (patch) | |
| tree | 0f32dc934871b281d5ff3b0e9e3cf2dcf85f5117 | |
| parent | 9a0cca837011c8920f2723ecc04ba6c17c9f033a (diff) | |
| parent | 2a498ae29cd2d4eeac52fa123bb97e5e2d5b1c90 (diff) | |
Merge pull request #257 from alexmv/master
Explitly unset SSH_AUTH_SOCK; it is preferred to the -i flag
| -rw-r--r-- | lib/puppet/provider/vcsrepo/git.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index a34b154..3b20a83 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -445,6 +445,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) if @resource.value(:identity) Tempfile.open('git-helper', Puppet[:statedir]) do |f| f.puts '#!/bin/sh' + f.puts 'export SSH_AUTH_SOCKET=' f.puts "exec ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -oConnectTimeout=120 -i #{@resource.value(:identity)} $*" f.close |