better directory struct

Vagrantfile

@@ -42,9 +42,12 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "chef_solo" do |chef|
     chef.version = "14.12.3" # version 14.12.9 fails to run
-    chef.cookbooks_path = "cookbooks/"
+    chef.cookbooks_path = [
-    chef.roles_path = "roles"
+      'ops/cookbooks/',
-    chef.add_role("gitea")
+      'ops/cookbooks/vendor'
+    ]
+    chef.roles_path = 'ops/roles'
+    chef.add_role('gitea')
     chef.json = {
       'custom-domain': 'localhost.vm42.us',
       'custom-title': 'My gitea server!',

cookbooks/solo.rb

@@ -1,2 +0,0 @@
-cookbook_path '/opt/theta42/provision-node/cookbooks'
-roles_path '/opt/theta42/provision-node/roles'

init.sh

@@ -1,6 +1,22 @@
-wget https://packages.chef.io/files/stable/chefdk/3.9.0/ubuntu/16.04/chefdk_3.9.0-1_amd64.deb -O chefdk.deb
+
-dpkg -i chefdk.deb
+apt install git wget nano;
-mkdir /opt/theta42 -p
+
-rm -rf /opt/theta42/provision-node
+if which chef-solo; then
-git clone https://git.theta42.com/git-hosting/provision-node.git /opt/theta42/provision-node
+	echo 'found chef-solo, skipping';
-chef-solo -c /opt/theta42/provision-node/cookbooks/solo.rb -j /opt/theta42/provision-node/cookbooks/hosting.json
+else
+	echo 'Installing chef-dk';
+
+	wget https://packages.chef.io/files/stable/chefdk/3.9.0/ubuntu/16.04/chefdk_3.9.0-1_amd64.deb -O chefdk.deb;
+
+	dpkg -i chefdk.deb;
+fi
+
+mkdir /opt/theta42 -p;
+
+rm -rf /opt/theta42/provision-node;
+
+## Install the node agent
+
+git clone https://git.theta42.com/git-hosting/provision-node.git /opt/theta42/provision-node;
+
+chef-solo -c /opt/theta42/provision-node/cookbooks/solo.rb -j /opt/theta42/provision-node/cookbooks/hosting.json;

ops/solo.rb

@@ -0,0 +1,5 @@
+cookbook_path [
+	'/opt/theta42/provision-node/ops/cookbooks',
+	'/opt/theta42/provision-node/ops/cookbooks/vendor',
+]
+roles_path '/opt/theta42/provision-node/ops/roles'