From 87d11c4c875e9a90bddaf8fad74350a684b64cdb Mon Sep 17 00:00:00 2001
From: Maurizio Pillitu <maurizio@session.it>
Date: Fri, 1 Aug 2014 12:26:19 +0200
Subject: [PATCH] fixed issue #5; introduced ChefDK as a way to install
 Berkshelf locally (avoiding ruby and bundler gem); README updated

Former-commit-id: a205322c350a3fdb9351aba956207fe756e722c6
Former-commit-id: 7b0b285da0c57c785dba6ee6d69c80c241fb4a67
---
 README.md                         |  1 +
 common/Gemfile                    |  3 ---
 common/create-vendor-cookbooks.sh |  7 +------
 common/install-vagrant-plugins.sh |  6 ++++++
 common/install.sh                 | 11 -----------
 common/scripts/install-ruby.sh    |  4 ++--
 common/scripts/static-ip.sh       |  4 ----
 common/scripts/vbox-additions.sh  |  2 +-
 packer/README.md                  |  4 ++--
 9 files changed, 13 insertions(+), 29 deletions(-)
 delete mode 100644 common/Gemfile
 create mode 100755 common/install-vagrant-plugins.sh
 delete mode 100755 common/install.sh

diff --git a/README.md b/README.md
index c5f0ed6..83e1c14 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ Features
 Installation
 ---
 * Make sure that
+  * [ChefDK](http://downloads.getchef.com/chef-dk) is installed
   * Ruby is installed (I'm currently running on v1.9.3, test with ```ruby -v```)
   * If you run on OSX, install XCode (version 5 or higher)
 * Checkout this project ```git clone -b alfresco-boxes-<last_tag> https://github.com/maoo/alfresco-boxes.gitub alfresco-boxes```
diff --git a/common/Gemfile b/common/Gemfile
deleted file mode 100644
index 8571dda..0000000
--- a/common/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
- 
-gem 'berkshelf'
\ No newline at end of file
diff --git a/common/create-vendor-cookbooks.sh b/common/create-vendor-cookbooks.sh
index 9fa6f33..90f1f87 100755
--- a/common/create-vendor-cookbooks.sh
+++ b/common/create-vendor-cookbooks.sh
@@ -1,8 +1,3 @@
 #!/bin/bash
-
 rm -Rf vendor-cookbooks *.lock
-
-# Run berkshelf
-# use the following for Berkshelf 2 or earliear
-# bundle exec berks install --path vendor-cookbooks
-bundle exec berks vendor vendor-cookbooks
+berks vendor vendor-cookbooks
diff --git a/common/install-vagrant-plugins.sh b/common/install-vagrant-plugins.sh
new file mode 100755
index 0000000..ced7c4d
--- /dev/null
+++ b/common/install-vagrant-plugins.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Install Vagrant Plugins
+vagrant plugin install vagrant-omnibus
+vagrant plugin install vagrant-vbguest
+vagrant plugin install vagrant-hosts
diff --git a/common/install.sh b/common/install.sh
deleted file mode 100755
index 3990542..0000000
--- a/common/install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Install Bundler Gem and run berkshelf
-gem install bundler
-bundle install
-bundle exec berks install --path vendor-cookbooks
-
-# Install Vagrant Plugins
-#vagrant plugin install vagrant-omnibus
-#vagrant plugin install vagrant-vbguest
-#vagrant plugin install vagrant-hosts
diff --git a/common/scripts/install-ruby.sh b/common/scripts/install-ruby.sh
index 833d86e..fc3e1b1 100755
--- a/common/scripts/install-ruby.sh
+++ b/common/scripts/install-ruby.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-. /tmp/common.sh
+. /home/vagrant/common.sh
 
 # kernel source is needed for vbox additions
 if [ -f /etc/redhat-release ] ; then
@@ -7,4 +7,4 @@ if [ -f /etc/redhat-release ] ; then
 elif [ -f /etc/debian_version ] ; then
     $apt remove libruby1.8 ruby1.8 ruby1.8-dev rubygems1.8
     $apt install ruby
-fi
\ No newline at end of file
+fi
diff --git a/common/scripts/static-ip.sh b/common/scripts/static-ip.sh
index 8a9308e..0cbc2c8 100755
--- a/common/scripts/static-ip.sh
+++ b/common/scripts/static-ip.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
-STATIC_IP=$1
-GW_IP=$2
-NETMASK=$3
-
 echo 'auto eth1' >> /etc/network/interfaces
 echo 'iface eth1 inet static' >> /etc/network/interfaces
 echo 'address '$STATIC_IP >> /etc/network/interfaces
diff --git a/common/scripts/vbox-additions.sh b/common/scripts/vbox-additions.sh
index 0e6a8d8..f66d1df 100755
--- a/common/scripts/vbox-additions.sh
+++ b/common/scripts/vbox-additions.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-. /tmp/common.sh
+. /home/vagrant/common.sh
 set -x
 if [ ! -e /home/vagrant/.vbox_version ] ; then
     exit 0
diff --git a/packer/README.md b/packer/README.md
index a1b8717..305101c 100644
--- a/packer/README.md
+++ b/packer/README.md
@@ -26,11 +26,11 @@ You can optionally use your Maven encryped password and set your Maven Master pa
 }
 ```
 
-If you don't have credentials to artifacts.alfresco.com you can test it using the Community edition: change [alfresco-allinone.json](https://github.com/maoo/alfresco-boxes/tree/master/packer/precise-alf421.json#L73) ```version``` attribute from ```4.2.1``` to ```4.2.f```
+If you don't have credentials to artifacts.alfresco.com you can test it using the Community edition: change [alfresco-allinone.json](https://github.com/maoo/alfresco-boxes/tree/master/packer/precise-alf421.json#L73) ```version``` attribute to ```5.0.a```
 
 To generate the box:
 ```
-cd alfresco-boxes/packer/vbox-precise-421
+cd alfresco-boxes/packer
 packer build -only virtualbox-iso precise-alf421.json
 ```
 This will create a output-virtualbox-iso/<box-name>.ovf and output-virtualbox-iso/<box-name>.vdmk, ready to be imported into VirtualBox.