Merge branch 'develop'

Berksfile

@@ -0,0 +1,17 @@
+source "https://supermarket.getchef.com"
+
+cookbook 'apache2', '~> 3.0.1'
+cookbook 'apt', '~> 2.6.1'
+cookbook 'build-essential', '~> 2.1.3'
+cookbook 'composer', '~> 2.0.0'
+cookbook 'git', '~> 4.1.0'
+cookbook 'magento-toolbox', '~> 0.0.3'
+cookbook 'mysql', '~> 6.0.15'
+cookbook 'nodejs', '~> 2.2.0'
+cookbook 'npm', '~> 0.1.2'
+cookbook 'percona', '~> 0.15.5'
+cookbook 'phing', '~> 0.0.3'
+cookbook 'php', '~> 1.5.0'
+cookbook 'python', '~> 1.4.6'
+cookbook 'mailhog', '~> 0.1.0'
+cookbook 'postfix', '~> 3.6.2'

Berksfile.lock

@@ -0,0 +1,96 @@
+DEPENDENCIES
+  apache2 (~> 3.0.1)
+  apt (~> 2.6.1)
+  build-essential (~> 2.1.3)
+  composer (~> 2.0.0)
+  git (~> 4.1.0)
+  magento-toolbox (~> 0.0.3)
+  mailhog (~> 0.1.0)
+  mysql (~> 6.0.15)
+  nodejs (~> 2.2.0)
+  npm (~> 0.1.2)
+  percona (~> 0.15.5)
+  phing (~> 0.0.3)
+  php (~> 1.5.0)
+  postfix (~> 3.6.2)
+  python (~> 1.4.6)
+
+GRAPH
+  7-zip (1.0.2)
+    windows (>= 1.2.2)
+  apache2 (3.0.1)
+    iptables (>= 0.0.0)
+    logrotate (>= 0.0.0)
+  apt (2.6.1)
+  ark (0.9.0)
+    7-zip (>= 0.0.0)
+    windows (>= 0.0.0)
+  build-essential (2.1.3)
+  chef-sugar (3.0.1)
+  chef_handler (1.1.6)
+  composer (2.0.0)
+    php (>= 0.0.0)
+    windows (>= 0.0.0)
+  dmg (2.2.2)
+  git (4.1.0)
+    build-essential (>= 0.0.0)
+    dmg (>= 0.0.0)
+    runit (>= 1.0)
+    windows (>= 0.0.0)
+    yum (~> 3.0)
+    yum-epel (>= 0.0.0)
+  iis (4.1.0)
+    windows (>= 1.34.6)
+  iptables (0.14.1)
+  logrotate (1.9.1)
+  magento-toolbox (0.0.3)
+    php (>= 0.0.0)
+  mailhog (0.1.0)
+    runit (>= 0.0.0)
+  mysql (6.0.17)
+    smf (>= 0.0.0)
+    yum-mysql-community (>= 0.0.0)
+  nodejs (2.2.0)
+    apt (>= 0.0.0)
+    ark (>= 0.0.0)
+    build-essential (>= 0.0.0)
+    yum-epel (>= 0.0.0)
+  npm (0.1.2)
+    nodejs (>= 0.0.0)
+  openssl (4.0.0)
+    chef-sugar (>= 0.0.0)
+  percona (0.15.5)
+    apt (>= 1.9)
+    openssl (>= 0.0.0)
+    yum (~> 3.0)
+  phing (0.0.3)
+    composer (>= 0.0.0)
+    php (>= 0.0.0)
+  php (1.5.0)
+    build-essential (>= 0.0.0)
+    iis (>= 0.0.0)
+    mysql (>= 0.0.0)
+    windows (>= 0.0.0)
+    xml (>= 0.0.0)
+    yum-epel (>= 0.0.0)
+  postfix (3.6.2)
+  python (1.4.6)
+    build-essential (>= 0.0.0)
+    yum-epel (>= 0.0.0)
+  rbac (1.0.2)
+  runit (1.5.18)
+    build-essential (>= 0.0.0)
+    yum (~> 3.0)
+    yum-epel (>= 0.0.0)
+  smf (2.2.6)
+    rbac (>= 1.0.1)
+  windows (1.36.6)
+    chef_handler (>= 0.0.0)
+  xml (1.2.13)
+    build-essential (>= 0.0.0)
+    chef-sugar (>= 0.0.0)
+  yum (3.5.3)
+  yum-epel (0.6.0)
+    yum (~> 3.0)
+  yum-mysql-community (0.1.14)
+    yum (>= 3.0)

CHANGELOG.md

@@ -0,0 +1,18 @@
+# Change Log
+
+## [1.0.0] - 2015-03-24
+
+### Changed
+- Use Chef provided boxes and Omnibus
+- Manage vendor cookbooks with Berkshelf
+- Replace MailCatcher with MailHog and Postfix
+- Use cookbook for Percona toolkit installation
+- Update nodejs version to 0.12.0
+- Remove Drush
+
+### Fixed
+- Upgrade cookbook for latest Chef
+
+### Removed
+- Remove oh-my-zsh
+- Remove Drush

README.md

@@ -11,9 +11,9 @@ Download and install [VirtualBox](http://www.virtualbox.org/)
 
 Download and install [vagrant](http://vagrantup.com/)
 
-Download a vagrant box (name of the box is supposed to be precise32)
+Install [vagrant-omnibus](https://github.com/chef/vagrant-omnibus) plugin
 
-    $ vagrant box add precise32 http://files.vagrantup.com/precise32.box
+    $ vagrant plugin install vagrant-omnibus
 
 Clone this repository
 
@@ -32,14 +32,12 @@ Installed software:
 * php
 * phpMyAdmin
 * Xdebug with Webgrind
-* zsh with [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
+* zsh
 * git, subversion
 * mc, vim, screen, tmux, curl
-* [MailCatcher](http://mailcatcher.me/)
+* [MailHog](https://github.com/mailhog/)
 * [Composer](http://getcomposer.org/)
 * Phing
-* Drupal utils:
-    * [Drush](http://drupal.org/project/drush)
 * Wordpress utils:
     * [WP-Cli](http://wp-cli.org/)
     * [wp2github.py](http://github.com/r8/wp2github.py)
@@ -105,11 +103,11 @@ something like
 so your call to webgrind will not overwrite the file for the process that
 happens to serve webgrind.
 
-### Mailcatcher
+### MailHog
 
-All emails sent by PHP are intercepted by MailCatcher. So normally no email would be delivered outside of the virtual machine. Instead you can check messages using web frontend for MailCatcher, which is running on port 1080 and also available on every domain:
+ll emails sent via local mail transport are intercepted by MailHog. So normally no email would be delivered outside of the virtual machine. Instead you can check messages using web frontend for MailHog, which is running on port 8025 and also available on every domain:
 
-    http://local.dev:1080
+    http://local.dev:8025
 
 ### Composer
 

Vagrantfile

@@ -7,18 +7,25 @@ Vagrant.configure("2") do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "precise32"
-
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system.
-  config.vm.box_url = "http://files.vagrantup.com/precise32.box"
+  config.vm.box = "chef/ubuntu-14.04"
+
+  if Vagrant.has_plugin? 'vagrant-omnibus'
+    # Set Chef version for Omnibus
+    config.omnibus.chef_version = :latest
+  else
+    raise Vagrant::Errors::VagrantError.new,
+      "vagrant-omnibus missing, please install the plugin:\n" +
+      "vagrant plugin install vagrant-omnibus"
+  end
 
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine.
   # Forward MySql port on 33066, used for connecting admin-clients to localhost:33066
   config.vm.network :forwarded_port, guest: 3306, host: 33066
   # Forward http port on 8080, used for connecting web browsers to localhost:8080
   config.vm.network :forwarded_port, guest: 80, host: 8080
+  # Forward http port on 8025, used for connecting web browsers to MailHog
+  config.vm.network :forwarded_port, guest: 8025, host: 8025
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
@@ -30,22 +37,23 @@ Vagrant.configure("2") do |config|
   # Provider-specific configuration so you can fine-tune VirtualBox for Vagrant.
   # These expose provider-specific options.
   config.vm.provider :virtualbox do |vb|
-    # Use VBoxManage to customize the VM. For example to change memory:
-    vb.customize ["modifyvm", :id, "--memory", "512"]
+    # Use VBoxManage to customize the VM.
+    # For example to change memory or number of CPUs:
+    vb.customize ["modifyvm", :id, "--memory", "1024"]
+    vb.customize ["modifyvm", :id, "--cpus", "1"]
   end
 
   # Enable provisioning with chef solo, specifying a cookbooks path, roles
   # path, and data_bags path (all relative to this Vagrantfile), and adding
   # some recipes and/or roles.
-  config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path = "cookbooks"
+  config.vm.provision :chef_zero do |chef|
+    chef.cookbooks_path = ["berks-cookbooks", "cookbooks"] 
     chef.data_bags_path = "data_bags"
 
     # List of recipes to run
     chef.add_recipe "vagrant_main"
+    chef.add_recipe "vagrant_main::nodejs"
     chef.add_recipe "vagrant_main::wordpress"
-    chef.add_recipe "vagrant_main::drupal"
     chef.add_recipe "vagrant_main::magento"
-    chef.add_recipe "vagrant_main::nodejs"
   end
 end

berks-cookbooks/7-zip/CHANGELOG.md

@@ -0,0 +1,13 @@
+7-zip Cookbook CHANGELOG
+========================
+This file is used to list changes made in each version of the 7-zip cookbook.
+
+
+v1.0.2
+------
+### Improvement
+- **[COOK-3476](https://tickets.opscode.com/browse/COOK-3476)** - Upgrade to 7-zip 9.22
+
+1.0.0
+-----
+- initial release

berks-cookbooks/7-zip/README.md

@@ -0,0 +1,50 @@
+7-zip Cookbook
+==============
+[7-Zip](http://www.7-zip.org/) is a file archiver with a high compression ratio. This cookbook installs the full 7-zip suite of tools (GUI and CLI).
+
+
+Requirements
+------------
+### Platform
+- Windows XP
+- Windows Vista
+- Windows Server 2003 R2
+- Windows 7
+- Windows Server 2008 (R1, R2)
+- Windows 8
+- Windows Server 2012
+
+### Cookbooks
+- windows
+
+
+Attributes
+----------
+- `node['7-zip']['home']` - location to install 7-zip files to.  default is `%SYSTEMDRIVE%\7-zip`
+
+
+Usage
+-----
+### default
+Downloads and installs 7-zip to the location specified by `node['7-zip']['home']`.  Also ensures `node['7-zip']['home']` is in the system path.
+
+
+License & Authors
+-----------------
+- Author:: Seth Chisamore (<[email protected]>)
+
+```text
+Copyright:: 2011, Opscode, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```

berks-cookbooks/7-zip/attributes/default.rb

@@ -0,0 +1,31 @@
+#
+# Author:: Seth Chisamore (<[email protected]>)
+# Cookbook Name:: 7-zip
+# Attribute:: default
+#
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if kernel['machine'] =~ /x86_64/
+  default['7-zip']['url']          = "http://downloads.sourceforge.net/sevenzip/7z922-x64.msi"
+  default['7-zip']['checksum']     = "f09bf515289eea45185a4cc673e3bbc18ce608c55b4cf96e77833435c9cdf3dc"
+  default['7-zip']['package_name'] = "7-Zip 9.22 (x64 edition)"
+else
+  default['7-zip']['url']          = "http://downloads.sourceforge.net/sevenzip/7z922.msi"
+  default['7-zip']['checksum']     = "86df264d22c3dd3ab80cb55a118da2d41bdd95c2db2cd09a6bbdf48f069e3d7a"
+  default['7-zip']['package_name'] = "7-Zip 9.22"
+end
+
+default['7-zip']['home']    = "#{ENV['SYSTEMDRIVE']}\\7-zip"

berks-cookbooks/7-zip/metadata.json

@@ -0,0 +1,31 @@
+{
+  "name": "7-zip",
+  "version": "1.0.2",
+  "description": "Installs/Configures the 7-zip file archiver",
+  "long_description": "7-zip Cookbook\n==============\n[7-Zip](http://www.7-zip.org/) is a file archiver with a high compression ratio. This cookbook installs the full 7-zip suite of tools (GUI and CLI).\n\n\nRequirements\n------------\n### Platform\n- Windows XP\n- Windows Vista\n- Windows Server 2003 R2\n- Windows 7\n- Windows Server 2008 (R1, R2)\n- Windows 8\n- Windows Server 2012\n\n### Cookbooks\n- windows\n\n\nAttributes\n----------\n- `node['7-zip']['home']` - location to install 7-zip files to.  default is `%SYSTEMDRIVE%\\7-zip`\n\n\nUsage\n-----\n### default\nDownloads and installs 7-zip to the location specified by `node['7-zip']['home']`.  Also ensures `node['7-zip']['home']` is in the system path.\n\n\nLicense & Authors\n-----------------\n- Author:: Seth Chisamore (<[email protected]>)\n\n```text\nCopyright:: 2011, Opscode, Inc.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n```\n",
+  "maintainer": "Opscode, Inc.",
+  "maintainer_email": "[email protected]",
+  "license": "Apache 2.0",
+  "platforms": {
+    "windows": ">= 0.0.0"
+  },
+  "dependencies": {
+    "windows": ">= 1.2.2"
+  },
+  "recommendations": {
+  },
+  "suggestions": {
+  },
+  "conflicting": {
+  },
+  "providing": {
+  },
+  "replacing": {
+  },
+  "attributes": {
+  },
+  "groupings": {
+  },
+  "recipes": {
+  }
+}