From 6750381bbf99ce1cbe837eacac55a8e2801e7394 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 10 Feb 2015 09:31:02 +0100
Subject: Use wheezy for vagrant source box #272

---
 provisioning/modules/pixelated/manifests/source.pp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'provisioning/modules/pixelated/manifests/source.pp')

diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp
index 3d0fa390..d4e9754a 100644
--- a/provisioning/modules/pixelated/manifests/source.pp
+++ b/provisioning/modules/pixelated/manifests/source.pp
@@ -4,7 +4,6 @@ class pixelated::source {
   package { [
     'git',
     'nodejs-legacy',
-    'npm',
     'python-dev',
     'python-virtualenv',
     'libffi-dev',
@@ -15,6 +14,8 @@ class pixelated::source {
     ensure => latest
   }
 
+  include pixelated::source::npm
+
   package { 'compass':
     ensure   => installed,
     provider => 'gem'
@@ -22,21 +23,9 @@ class pixelated::source {
 
   stage { 'install_pixelated': }
 
-  class { 'install_pixelated' :
+  class { 'pixelated::source::install_useragent' :
     stage => install_pixelated
   }
 
-  class install_pixelated {
-    $virtualenv_path = '/home/vagrant/user-agent-venv'
-
-    exec { 'install-pixelated':
-      environment => 'USERNAME=vagrant',
-      command     => "/vagrant/install-pixelated.sh -v \"${virtualenv_path}\" -n /home/vagrant/boxed_node_modules",
-      cwd         => '/vagrant',
-      user        => 'vagrant',
-      timeout     => 0
-    }
-  }
-
   Stage['main'] -> Stage['install_pixelated']
 }
-- 
cgit v1.2.3