summaryrefslogtreecommitdiff
path: root/vagrant
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-03-03 17:01:22 +0100
committervarac <varacanero@zeromail.org>2015-03-03 17:01:22 +0100
commitc659c973077f329042d1df1632e863bb4e92570b (patch)
tree27e85ebd420f227021e9ad130836ac1b7e8d6158 /vagrant
parent282abe541a2543face242ce35c89d9e4b032de23 (diff)
parent060ff4f8c901c4cd54189f8c075614082eabe1ae (diff)
Merge branch 'vagrant_install_leap_cli_from_source' into develop
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/install-platform.pp21
1 files changed, 17 insertions, 4 deletions
diff --git a/vagrant/install-platform.pp b/vagrant/install-platform.pp
index 30f0b1e6..465ca78a 100755
--- a/vagrant/install-platform.pp
+++ b/vagrant/install-platform.pp
@@ -11,10 +11,23 @@ file { '/etc/gemrc':
content => "---\n:sources:\n - https://rubygems.org/"
}
-package { 'leap_cli':
- ensure => latest,
- provider => 'gem',
- require => [ Package['ruby1.9.1-dev'], File['/etc/gemrc'] ]
+vcsrepo { '/srv/leap/leap_cli':
+ ensure => present,
+ force => true,
+ revision => 'develop',
+ provider => 'git',
+ source => 'https://leap.se/git/leap_cli.git',
+ owner => 'root',
+ group => 'root',
+ notify => Exec['install_leap_cli'],
+ require => Package['git']
+}
+
+exec { 'install_leap_cli':
+ command => '/usr/bin/rake build && /usr/bin/rake install',
+ cwd => '/srv/leap/leap_cli',
+ refreshonly => true,
+ require => [ Package['ruby1.9.1-dev'], File['/etc/gemrc'], Package['rake'] ]
}
file { [ '/srv/leap', '/srv/leap/configuration', '/var/log/leap' ]: