diff options
| -rw-r--r-- | .travis.yml | 25 | ||||
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | Gemfile.lock | 14 | ||||
| -rw-r--r-- | Modulefile | 4 | ||||
| -rw-r--r-- | README.GIT.markdown | 12 | ||||
| -rw-r--r-- | lib/puppet/provider/vcsrepo/git.rb | 2 |
6 files changed, 48 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f349b8d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,25 @@ +--- +branches: + only: + - master +notifications: + email: false +language: ruby +script: 'bundle exec rake spec' +after_success: +- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng +- .forge-releng/publish +rvm: +- 1.8.7 +- 1.9.3 +env: + matrix: + - PUPPET_VERSION=2.6.18 + - PUPPET_VERSION=2.7.21 + - PUPPET_VERSION=3.1.1 + global: + - PUBLISHER_LOGIN=puppetlabs + - secure: |- + ZiIkYd9+CdPzpwSjFPnVkCx1FIlipxpbdyD33q94h2Tj5zXjNb1GXizVy0NR + kVxGhU5Ld8y9z8DTqKRgCI1Yymg3H//OU++PKLOQj/X5juWVR4URBNPeBOzu + IJBDl1MADKA4i1+jAZPpz4mTvTtKS4pWKErgCSmhSfsY1hs7n6c= @@ -1,5 +1,5 @@ -source :rubygems +source 'https://rubygems.org' gem 'rake', '~> 0.8.7' -gem 'rspec', '~> 1.2.9' -gem 'mocha', '~> 0.12.7', :require => false +gem 'rspec', '~> 1.3' +gem 'mocha', '~> 0.12.9', :require => false gem 'puppet', '~> 2.7' diff --git a/Gemfile.lock b/Gemfile.lock index 210a2dd..ce22804 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,20 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: - facter (1.6.13) + facter (1.7.2) metaclass (0.0.1) - mocha (0.12.7) + mocha (0.12.10) metaclass (~> 0.0.1) - puppet (2.7.19) + puppet (2.7.22) facter (~> 1.5) rake (0.8.7) - rspec (1.2.9) + rspec (1.3.2) PLATFORMS ruby DEPENDENCIES - mocha (~> 0.12.7) + mocha (~> 0.12.9) puppet (~> 2.7) rake (~> 0.8.7) - rspec (~> 1.2.9) + rspec (~> 1.3) @@ -1,2 +1,4 @@ name 'puppetlabs/vcsrepo' -version '0.1.1' +version '0.1.2' +summary 'Manage repositories from various version control systems' +description 'Manage repositories from various version control systems' diff --git a/README.GIT.markdown b/README.GIT.markdown index d6b8afe..846bdcc 100644 --- a/README.GIT.markdown +++ b/README.GIT.markdown @@ -76,9 +76,15 @@ Keep the repository at the latest revision (note: this will always overwrite loc For sources that use SSH (eg, `username@server:...`) ---------------------------------------------------- -Manage your SSH keys with Puppet and use `require` in your `vcsrepo` -to ensure they are present. For more information, see the `require` -metaparameter documentation[1]. +If your SSH key is associated with a user, simply fill the `user` parameter to use his keys. + +Example: + + user => 'toto' # will use toto's $HOME/.ssh setup + + +Otherwise, manage your SSH keys with Puppet and use `require` in your `vcsrepo` to ensure they are present. +For more information, see the `require` metaparameter documentation[1]. More Examples ------------- diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index 6f979cb..76fa315 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -293,7 +293,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) if @resource.value(:identity) Tempfile.open('git-helper') do |f| f.puts '#!/bin/sh' - f.puts "exec ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -i #{@resource.value(:identity)} $*" + f.puts "exec ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -oConnectTimeout=120 -i #{@resource.value(:identity)} $*" f.close FileUtils.chmod(0755, f.path) |