Merge b32b237 into 06f7dd5

README.md

@@ -32,19 +32,23 @@ For the example below to work out-of-the-box, it's required to have both joola a
  For more details on the installation process, please refer to [this guide](http://github.com/joola/joola/wiki/install-joola).
 
 #### Using Vagrant
-We have included a [Vagrant](http://www.vagrantup.com) file to support easy playing around and testing. Running `vagrant up` will install all needed dependencies and run joola for you in a sand boxed virtual environment. 
+We have included a [Vagrant](http://www.vagrantup.com) file to support easy playing around and testing. Running `vagrant up` will install all needed dependencies and allow you to run joola in a sand boxed virtual environment. 
 
 ```bash
 # Clone this repository
 $ git clone https://github.com/joola/joola
 $ cd joola
+# Update submodules containing chef recipes
+$ git submodule init
+$ git submodule update
+$ npm install
 
 $ vagrant up
 # wait for the box to come online
 $ vagrant ssh 
 
 # once in the box
-$ cd /opt/joola/node_modules/joola
+$ cd /vagrant
 $ node joola.js
 ```
 

Vagrantfile

@@ -5,7 +5,7 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "ubuntu/trusty32"
+  config.vm.box = "ubuntu/trusty64"
 
   config.vm.network "forwarded_port", guest: 8080, host: 8080
   config.vm.network "forwarded_port", guest: 8081, host: 8081

build/cookbooks/joola/recipes/default.rb

@@ -6,20 +6,20 @@
   action :enable
 end
 
-bash "install joola" do
-  user "root"
-  code <<-EOH
-    mkdir /opt/joola
-    mkdir /var/log/joola
-    cd /opt/joola
+#bash "install joola" do
+#  user "root"
+#  code <<-EOH
+#    mkdir /opt/joola
+#    mkdir /var/log/joola
+#    cd /opt/joola
 
-    sudo chown -R root /root/.npm
+#    sudo chown -R root /root/.npm
 
-    npm install /vagrant --production
-    chown -R vagrant /opt/joola
-    chown -R vagrant /var/log/joola
-  EOH
-end
+#    npm install /vagrant --production
+#    chown -R vagrant /opt/joola
+#    chown -R vagrant /var/log/joola
+#  EOH
+#end
 
 #bash "install pm2" do
 #  user "root"

config/default.yml

@@ -1,4 +1,4 @@
-version: 0.1.4
+version: 0.1.5
 interfaces:
   webserver:
     enabled: true
@@ -8,7 +8,7 @@ interfaces:
     port: 8080
     secureport: 8081
     secure: true
-    secureonly: true
+    secureonly: false
     keyfile: ./config/certs/server.key
     certfile: ./config/certs/server.crt
     ca: ./config/certs/ca.crt

test/common.js

@@ -17,6 +17,8 @@ global.common = exports;
 
 process.env.NODE_ENV = 'test';
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0"; //allow node-request to deal with Error: DEPTH_ZERO_SELF_SIGNED_CERT
+process.env.JOOLA_CONFIG_INTERFACES_WEBSERVER_SECUREONLY = true;
+process.env.JOOLA_CONFIG_AUTHENTICATION_BASICAUTH_ENABLED = true;
 
 global.hook_stdout = function (callback) {
   var old_write = process.stdout.write;