Merge pull request #1932 from lmorchard/vagrant-box-update

Issue #1909: Use rebuilt VM image for VirtualBox

puppet/files/home/vagrant/bash_profile

@@ -8,6 +8,7 @@ fi
 # User specific environment and startup programs
 PATH=$HOME/bin:/home/vagrant/src/kumascript/node_modules/.bin:$PATH
 export PATH
+export NODE_PATH=/usr/local/lib/node_modules
 
 # More useful to start in the project directory than in user home
 cd /home/vagrant/src

puppet/manifests/classes/basics.pp

@@ -1,10 +1,3 @@
-# Make sure the repos get updated
-class update_repos {
-    exec { "apt-update":
-        command => '/usr/bin/apt-get update'
-    }
-}
-
 # Get apache up and running
 class apache {
     package { [ "apache2" ]:

puppet/manifests/classes/nodejs.pp

@@ -29,11 +29,9 @@
         source => "/home/vagrant/src/puppet/files/usr/share/npm/npmrc",
         require => Package["npm"]
     }
-    exec { 'npm-install':
-        cwd => "/home/vagrant/src/kumascript",
-        user => 'vagrant',
-        command => "/usr/bin/npm install fibers",
-        creates => "/home/vagrant/src/kumascript/node_modules/fibers",
+    exec { 'npm-fibers-install':
+        command => "/usr/bin/npm install -g fibers@0.6.4",
+        creates => "/usr/local/lib/node_modules/fibers",
         require => [
             Package["nodejs"], Package["nodejs-dev"], Package["npm"],
             File["/usr/include/node"], File["/root/.npm"],

puppet/manifests/dev-vagrant.pp

@@ -31,8 +31,6 @@
     class {
         dev_hacks: stage => hacks;
 
-        update_repos: stage => pre;
-
         dev_tools: stage => tools;
 
         apache:         stage => basics;

vagrantconfig.yaml

@@ -9,7 +9,7 @@ ip_address: 192.168.10.55
 memory_size: 768
 number_cpus: 2
 box: "kuma-ubuntu"
-virtual_box_url: "http://people.mozilla.com/~jleidel/vagrant/kuma-precise-virtualbox.box"
+virtual_box_url: "http://people.mozilla.org/~lorchard/vm/kuma-ubuntu-20140129.box"
 vmware_box_url: "http://people.mozilla.com/~jleidel/vagrant/kuma-precise-vmware.box"
 package_name: "kuma-ubuntu.box"
 mount_point: "/home/vagrant/src"