5 files changed, 5 insertions, 74 deletions
diff --git a/provisioning/build-hackday-box.sh b/provisioning/build-hackday-box.sh
deleted file mode 100755
index 858fc40b..00000000
--- a/provisioning/build-hackday-box.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2014 ThoughtWorks, Inc.
-#
-# Pixelated is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Pixelated is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-
-PROVISIONING_PATH=$(dirname $0)
-USER_AGENT_DIR="$PROVISIONING_PATH/.."
-
-PACKAGE_FILE="hackday-pixelated-user-agent.box"
-BOX_NAME="hackaday-pixelated-user-agent"
-
-pushd $USER_AGENT_DIR
-
-# clear old boxes
-vagrant destroy -f source
-vagrant destroy -f hackday
-vagrant box remove $BOX_NAME
-rm "$USER_AGENT_DIR/$PACKAGE_FILE"
-
-# build from scratch
-vagrant up source && \
-vagrant package --output="$USER_AGENT_DIR/$PACKAGE_FILE" && \
-vagrant box add $BOX_NAME $PACKAGE_FILE
-
-SUCCESS=$?
-
-popd
-
-if [ $SUCCESS -eq 0 ] ; then
-	echo
-	echo "Created hackday box $PACKAGE_FILE"
-	echo "If you want to test it, run"
-	echo
-	echo "vagrant up hackday"
-else
-	echo "Error while building hackday box" 1>&2
-fi
-
-exit $SUCCESS
-
diff --git a/provisioning/manifests/hackday.pp b/provisioning/manifests/hackday.pp
deleted file mode 100644
index 87a72728..00000000
--- a/provisioning/manifests/hackday.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { '::pixelated::hackday_dev_env': }
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',