Updating hiera config, fixing templatedir deprecated warning, bumping drupal_php dependency.

Author: tizzo

Puppetfile.lock

@@ -29,7 +29,7 @@ FORGE
     saz-memcached (2.7.1)
       puppetlabs-firewall (>= 0.1.0)
       puppetlabs-stdlib (>= 3.2.0)
-    zivtech-drupal_php (1.1.0)
+    zivtech-drupal_php (2.0.1)
       nodes-php (>= 0.9.0)
       puppetlabs-apache (>= 1.0.0)
       puppetlabs-stdlib (>= 1.0.0)

Vagrantfile

@@ -35,13 +35,15 @@ Vagrant.configure('2') do |config|
 
   config.ssh.forward_agent = true
 
+  config.vm.provision :shell, inline: "/bin/sed -i '/templatedir/d' /etc/puppet/puppet.conf"
+
   # The puppetlabs vm comes with a puppet.conf that includes a deprecated
   # config directive, delete it to avoid confusing users.
   config.vm.provision :shell, :inline => "/bin/sed -i '/templatedir=\(.*\)/d' /etc/puppet/puppet.conf"
 
   if Vagrant.has_plugin?("vagrant-librarian-puppet")
     config.librarian_puppet.placeholder_filename = 'README.md'
-  elsif not File.exist?('modules/drupal_php/manifests/init.pp')
+  elsif not File.exist?(File.join(__dir__, 'modules', 'drupal_php', 'manifests', 'init.pp'))
     raise Vagrant::Errors::VagrantError.new, "You are not using vagrant-librarian-puppet and have not installed the dependencies."
   end
 

hiera/common.yaml

@@ -1,5 +1,6 @@
 mysql::server::root_password: 'root'
 drupal_php::server::apache::purge_configs: false
+drupal_php::server::apache::server_default_vhost: false
 drush::git_ref: "master"
 drupal_php::log_errors: true
 drupal_php::memory_limit: 128M