From b503fc864c8152f4e76d284a6ef89eddec59028b Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 1 Jan 2015 10:38:00 +0100
Subject: Simplyfied Vagrant support, added offlineimap config file

Change-Id: I4bdb6cfe34d4c0edbf31d425d7f682c137ae1596
---
 vagrant/install-platform.pp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100755 vagrant/install-platform.pp

(limited to 'vagrant/install-platform.pp')

diff --git a/vagrant/install-platform.pp b/vagrant/install-platform.pp
new file mode 100755
index 00000000..012a0eb0
--- /dev/null
+++ b/vagrant/install-platform.pp
@@ -0,0 +1,19 @@
+class {'apt': }
+File['/etc/apt/preferences'] ->
+  Exec['refresh_apt'] ->
+    Package <| ( title != 'lsb' ) |>
+
+package { [ 'rsync', 'ruby-hiera-puppet', 'git', 'ruby1.9.1-dev', 'rake', 'jq' ]:
+  ensure => installed
+}
+
+package { 'leap_cli':
+  ensure   => latest,
+  provider => 'gem',
+  require  => Package['ruby1.9.1-dev']
+}
+
+file { [ '/srv/leap', '/srv/leap/configuration', '/var/log/leap' ]:
+  ensure => directory
+}
+
-- 
cgit v1.2.3


From 0e872f337358bdab1c7c0d7ae904f19b810ea290 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 27 Jan 2015 15:09:17 +0100
Subject: configure vagrantbox to use https for fetching gems (Feature #6676)

Change-Id: I0c29e7e07c294e2b5480396bed9db1c3694127d7
---
 vagrant/install-platform.pp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'vagrant/install-platform.pp')

diff --git a/vagrant/install-platform.pp b/vagrant/install-platform.pp
index 012a0eb0..30f0b1e6 100755
--- a/vagrant/install-platform.pp
+++ b/vagrant/install-platform.pp
@@ -1,16 +1,20 @@
 class {'apt': }
 File['/etc/apt/preferences'] ->
   Exec['refresh_apt'] ->
-    Package <| ( title != 'lsb' ) |>
+  Package <| ( title != 'lsb' ) |>
 
 package { [ 'rsync', 'ruby-hiera-puppet', 'git', 'ruby1.9.1-dev', 'rake', 'jq' ]:
   ensure => installed
 }
 
+file { '/etc/gemrc':
+  content => "---\n:sources:\n  - https://rubygems.org/"
+}
+
 package { 'leap_cli':
   ensure   => latest,
   provider => 'gem',
-  require  => Package['ruby1.9.1-dev']
+  require  => [ Package['ruby1.9.1-dev'], File['/etc/gemrc'] ]
 }
 
 file { [ '/srv/leap', '/srv/leap/configuration', '/var/log/leap' ]:
-- 
cgit v1.2.3


From 060ff4f8c901c4cd54189f8c075614082eabe1ae Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 3 Mar 2015 10:34:07 +0100
Subject: Vagrant: Install leap_cli from source

The develop branch of leap_platform needs leap_cli >= v1.6.3.
The leap_cli gem is only 1.6.2, because it needs to work together
with the master branch of leap_platform.
Therefore we need to install leap_cli from it's develop branch from
source.

Change-Id: I78b433bfa31ad42f78c49949c757bcfb6cd5c30b
---
 vagrant/install-platform.pp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'vagrant/install-platform.pp')

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' ]:
-- 
cgit v1.2.3