diff options
Diffstat (limited to 'provisioning/modules')
3 files changed, 5 insertions, 21 deletions
diff --git a/provisioning/modules/pixelated/files/activate_custom_node_modules.sh b/provisioning/modules/pixelated/files/activate_custom_node_modules.sh index 2e15a42b..f46b67e1 100755 --- a/provisioning/modules/pixelated/files/activate_custom_node_modules.sh +++ b/provisioning/modules/pixelated/files/activate_custom_node_modules.sh @@ -28,13 +28,10 @@ fi source /home/vagrant/user-agent-venv/bin/activate cd /vagrant/service -echo "running python setup.py develop" -python setup.py develop >/dev/null -echo "running bower install" -cd /vagrant/web-ui/ -node_modules/.bin/bower install >/dev/null +echo "running python setup" +./go setuppy > /dev/null +echo "running js setup" +./go setupjs > /dev/null -echo "running go build" -LC_ALL=en_US.UTF-8 ./go build cd /vagrant diff --git a/provisioning/modules/pixelated/manifests/hackday_dev_env.pp b/provisioning/modules/pixelated/manifests/hackday_dev_env.pp deleted file mode 100644 index 78de0bba..00000000 --- a/provisioning/modules/pixelated/manifests/hackday_dev_env.pp +++ /dev/null @@ -1,14 +0,0 @@ -# -class pixelated::hackday_dev_env { - file { '/home/vagrant/.activate_custom_node_modules.sh': - owner => 'vagrant', - mode => '0600', - 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", - user => 'vagrant', - require => File['/home/vagrant/.activate_custom_node_modules.sh'] - } -} diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp index d4e9754a..3d7ca037 100644 --- a/provisioning/modules/pixelated/manifests/source.pp +++ b/provisioning/modules/pixelated/manifests/source.pp @@ -7,6 +7,7 @@ class pixelated::source { 'python-dev', 'python-virtualenv', 'libffi-dev', + 'libssl-dev', 'g++', 'ruby-dev', 'libsqlite3-dev', |