summaryrefslogtreecommitdiff
path: root/provisioning
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-02-11 11:21:41 +0100
committervarac <varacanero@zeromail.org>2016-02-11 11:21:41 +0100
commit8fec6c4d9b52e2562752b0ed847705e7685670fa (patch)
treecdd27d9547fa8392a782da88f9361a1dfe24cc0d /provisioning
parenta1395e944e94964d4da69cd744330a099f0c6dd4 (diff)
don't update venv on every login shell
Diffstat (limited to 'provisioning')
-rw-r--r--provisioning/modules/pixelated/manifests/source/install_useragent.pp12
1 files changed, 7 insertions, 5 deletions
diff --git a/provisioning/modules/pixelated/manifests/source/install_useragent.pp b/provisioning/modules/pixelated/manifests/source/install_useragent.pp
index 8661f655..a2473b3a 100644
--- a/provisioning/modules/pixelated/manifests/source/install_useragent.pp
+++ b/provisioning/modules/pixelated/manifests/source/install_useragent.pp
@@ -1,3 +1,5 @@
+# install useragent in a virtualenv, deploy helper script
+# and make sure venv is activated on login
class pixelated::source::install_useragent {
$virtualenv_path = '/home/vagrant/user-agent-venv'
@@ -15,16 +17,16 @@ class pixelated::source::install_useragent {
timeout => 0
}
- file { '/home/vagrant/.activate_custom_node_modules.sh':
+ file { '/home/vagrant/activate_custom_node_modules.sh':
owner => 'vagrant',
- mode => '0600',
+ mode => '0755',
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",
+ command => "/bin/bash -c 'echo \"source /home/vagrant/user-agent-venv/bin/activate\" >> /home/vagrant/.bashrc'",
+ unless => "/bin/grep \"source /home/vagrant/user-agent-venv/bin/activate\" /home/vagrant/.bashrc",
user => 'vagrant',
- require => [Exec['install-pixelated'], File['/home/vagrant/.activate_custom_node_modules.sh']]
+ require => [Exec['install-pixelated'], File['/home/vagrant/activate_custom_node_modules.sh']]
}
}