From ce3998dc2c4b57ad790be50bf27e3f682a3205f6 Mon Sep 17 00:00:00 2001
From: Varac <varac@leap.se>
Date: Wed, 7 Jun 2017 11:23:56 +0200
Subject: Run activate_custom_node_modules.sh from .bashrc

---
 provisioning/modules/pixelated/files/.bashrc              |  5 +++--
 .../pixelated/manifests/source/install_useragent.pp       | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'provisioning/modules')

diff --git a/provisioning/modules/pixelated/files/.bashrc b/provisioning/modules/pixelated/files/.bashrc
index 25a940ba..88766b5d 100644
--- a/provisioning/modules/pixelated/files/.bashrc
+++ b/provisioning/modules/pixelated/files/.bashrc
@@ -120,5 +120,6 @@ fi
 # Pixelated
 
 cd /vagrant || exit
-# shellcheck disable=SC1091
-source /home/vagrant/.venvs/pixua/bin/activate
+export NODE_PATH=/home/vagrant/boxed_node_modules/node_modules/
+# shellcheck disable=SC1090
+source ${virtualenv_path}/bin/activate
diff --git a/provisioning/modules/pixelated/manifests/source/install_useragent.pp b/provisioning/modules/pixelated/manifests/source/install_useragent.pp
index d79d4144..4fe08d9b 100644
--- a/provisioning/modules/pixelated/manifests/source/install_useragent.pp
+++ b/provisioning/modules/pixelated/manifests/source/install_useragent.pp
@@ -9,7 +9,7 @@ class pixelated::source::install_useragent {
     # see https://projects.puppetlabs.com/issues/23053
     # therefore we need to explicitily set them here
     environment => [ 'USERNAME=vagrant', 'HOME=/home/vagrant' ],
-    command     => '/usr/bin/make install',
+    command     => "/vagrant/install-pixelated.sh -v \"${virtualenv_path}\" -n /home/vagrant/boxed_node_modules",
     cwd         => '/vagrant',
     user        => 'vagrant',
     # to debug use this
@@ -17,10 +17,15 @@ class pixelated::source::install_useragent {
     timeout     => 0
   }
 
-  file { '/home/vagrant/.bashrc':
-    owner  => 'vagrant',
-    mode   => '0644',
-    source => 'puppet:///modules/pixelated/.bashrc',
+  file {
+    '/home/vagrant/.bashrc':
+      owner  => 'vagrant',
+      mode   => '0644',
+      source => 'puppet:///modules/pixelated/.bashrc';
+    '/home/vagrant/activate_custom_node_modules.sh':
+      owner  => 'vagrant',
+      mode   => '0755',
+      source => 'puppet:///modules/pixelated/activate_custom_node_modules.sh';
   }
 
 }
-- 
cgit v1.2.3