From 362a0c0374166ccd652eb61ec4551e4194f9d2c5 Mon Sep 17 00:00:00 2001
From: Bruno Wagner <bwgpro@gmail.com>
Date: Tue, 28 Apr 2015 18:29:57 -0300
Subject: Updated user agent vagrant to run on Jessie

---
 Vagrantfile                                                | 10 ++--------
 .../modules/pixelated/manifests/hackday_dev_env.pp         | 14 --------------
 provisioning/modules/pixelated/manifests/source.pp         |  1 +
 3 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 provisioning/modules/pixelated/manifests/hackday_dev_env.pp

diff --git a/Vagrantfile b/Vagrantfile
index ecced488..6f1f1d1f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -27,14 +27,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # see https://leap.se/en/docs/platform/details/development#Verify.vagrantbox.download
   # for details
 
-  config.vm.box = "leap-wheezy"
+  config.vm.box = "boxcutter/debian80"
 
   config.vbguest.auto_update = false
 
   config.vm.define "source", primary: true do |source|
-    source.vm.provider :virtualbox do |v, override|
-      override.vm.box_url = "https://downloads.leap.se/platform/vagrant/virtualbox/leap-wheezy.box"
-    end
     source.vm.provider "libvirt" do |v, override|
       override.vm.box_url = "https://downloads.leap.se/platform/vagrant/libvirt/leap-wheezy.box"
     end
@@ -49,10 +46,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # until https://github.com/pixelated-project/pixelated-user-agent/issues/226 is not fixed,
     # we depend on a debian testing box
 
-    config.vm.box = "leap-wheezy"
-    deb.vm.provider "virtualbox" do |v, override|
-      override.vm.box_url = "https://downloads.leap.se/platform/vagrant/virtualbox/leap-wheezy.box"
-    end
+    config.vm.box = "boxcutter/debian80"
     deb.vm.provider "libvirt" do |v, override|
       override.vm.box_url = "https://downloads.leap.se/platform/vagrant/libvirt/leap-wheezy.box"
     end
diff --git a/provisioning/modules/pixelated/manifests/hackday_dev_env.pp b/provisioning/modules/pixelated/manifests/hackday_dev_env.pp
deleted file mode 100644
index 78de0bba..00000000
--- a/provisioning/modules/pixelated/manifests/hackday_dev_env.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-class pixelated::hackday_dev_env {
-  file { '/home/vagrant/.activate_custom_node_modules.sh':
-    owner  => 'vagrant',
-    mode   => '0600',
-    source => 'puppet:///modules/pixelated/activate_custom_node_modules.sh',
-  }
-  exec { 'add_custom_node_modules_to_bashrc':
-    command => "/bin/bash -c 'echo \"source /home/vagrant/.activate_custom_node_modules.sh\" >> /home/vagrant/.bashrc'",
-    unless  => "/bin/grep \"source /home/vagrant/.activate_custom_node_modules.sh\" /home/vagrant/.bashrc",
-    user    => 'vagrant',
-    require => File['/home/vagrant/.activate_custom_node_modules.sh']
-  }
-}
diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp
index d4e9754a..3d7ca037 100644
--- a/provisioning/modules/pixelated/manifests/source.pp
+++ b/provisioning/modules/pixelated/manifests/source.pp
@@ -7,6 +7,7 @@ class pixelated::source {
     'python-dev',
     'python-virtualenv',
     'libffi-dev',
+    'libssl-dev',
     'g++',
     'ruby-dev',
     'libsqlite3-dev',
-- 
cgit v1.2.3