From 68892379d387abbd8e7ebf81a7e317a8034b34eb Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Thu, 1 Jun 2017 15:58:42 -0300
Subject: Revert "Use "make install" to install useragent from source"

This reverts commit e439f48f40f60f5f317e0ac4b54178b0b677c339.
---
 .../manifests/source/install_useragent.pp          | 28 +++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

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

diff --git a/provisioning/modules/pixelated/manifests/source/install_useragent.pp b/provisioning/modules/pixelated/manifests/source/install_useragent.pp
index d79d4144..8afbac0c 100644
--- a/provisioning/modules/pixelated/manifests/source/install_useragent.pp
+++ b/provisioning/modules/pixelated/manifests/source/install_useragent.pp
@@ -1,4 +1,4 @@
-# install useragent in a virtualenv
+# install useragent in a virtualenv, deploy helper script
 # and make sure venv is activated on login
 class pixelated::source::install_useragent {
 
@@ -9,18 +9,34 @@ 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
-    logoutput   => true,
+    # logoutput   => true,
     timeout     => 0
   }
 
-  file { '/home/vagrant/.bashrc':
+  file { '/home/vagrant/activate_custom_node_modules.sh':
     owner  => 'vagrant',
-    mode   => '0644',
-    source => 'puppet:///modules/pixelated/.bashrc',
+    mode   => '0755',
+    source => 'puppet:///modules/pixelated/activate_custom_node_modules.sh',
   }
 
+  exec { 'add_custom_node_modules_to_bashrc':
+    command => "/bin/bash -c 'echo \"source ${virtualenv_path}/bin/activate\" >> /home/vagrant/.bashrc'",
+    unless  => "/bin/grep \"source ${virtualenv_path}/bin/activate\" /home/vagrant/.bashrc",
+    user    => 'vagrant',
+    require => [Exec['install-pixelated'], File['/home/vagrant/activate_custom_node_modules.sh']]
+  }
+  exec { 'add_custom_node_path_to_bashrc':
+    command => "/bin/bash -c 'echo NODE_PATH=/home/vagrant/boxed_node_modules/node_modules/ >> /home/vagrant/.bashrc'",
+    unless  => '/bin/grep NODE_PATH /home/vagrant/.bashrc',
+    user    => 'vagrant',
+  }
+  exec { 'add_rule_to_change_to_vagrant_folder_on_login':
+    command => "/bin/echo 'cd /vagrant' >> /home/vagrant/.bashrc",
+    unless  => "/bin/grep 'cd /vagrant' /home/vagrant/.bashrc",
+    user    => 'vagrant',
+  }
 }
-- 
cgit v1.2.3