Merge pull request #556 from jeff1evesque/feature-451

#451: replace 'configure_php.pp' with 'site.pp'

Vagrantfile

@@ -92,15 +92,16 @@ Vagrant.configure(2) do |config|
     puppet.manifest_file    = 'configure_httpd.pp'
   end
 
-  ## Custom Manifest: install, and configure php (required before drush)
-  #
-  #  Note: future parser allow array iteration in the puppet manifest
-  config.vm.provision "puppet" do |puppet|
-    puppet.environment_path = 'puppet/environment'
-    puppet.environment      = 'development'
-    puppet.manifests_path   = 'puppet/environment/development/manifests'
-    puppet.module_path      = 'puppet/environment/development/modules_contrib'
-    puppet.manifest_file    = "configure_php.pp"
+  ## Custom Manifest: install needed packages
+  config.vm.provision 'puppet' do |puppet|
+    puppet.environment_path  = 'puppet/environment'
+    puppet.environment       = 'development'
+    puppet.manifests_path    = 'puppet/environment/development/manifests'
+    puppet.module_path       = [
+      'puppet/environment/development/modules_contrib',
+      'puppet/environment/development/modules',
+    ]
+    puppet.manifest_file     = 'site.pp'
   end
 
   ## Custom Manifest: install drush

puppet/environment/development/manifests/site.pp

@@ -0,0 +1,5 @@
+###
+### site.pp: load all necessary modules.
+###
+
+contain php