allow docroot to be subdirectory of deploy directory

providers/mod_php_apache2.rb

@@ -46,9 +46,11 @@
 action :before_deploy do
 
   new_resource = @new_resource
+  apache_docroot = "#{new_resource.application.path}/current"
+  apache_docroot << "/#{new_resource.docroot}" if new_resource.docroot
 
   web_app new_resource.application.name do
-    docroot "#{new_resource.application.path}/current"
+    docroot apache_docroot
     template new_resource.webapp_template || 'php.conf.erb'
     cookbook new_resource.webapp_template ? new_resource.cookbook_name : "application_php"
     server_name "#{new_resource.application.name}.#{node['domain']}"

providers/php.rb

@@ -64,6 +64,8 @@ def install_packages
 
 def create_settings_file
   host = new_resource.find_database_server(new_resource.database_master_role)
+  relative_docroot = new_resource.docroot
+  relative_docroot ||= new_resource.application.docroot
 
   template "#{new_resource.path}/shared/#{new_resource.local_settings_file_name}" do
     source new_resource.settings_template || "#{new_resource.local_settings_file_name}.erb"
@@ -72,6 +74,7 @@ def create_settings_file
     mode "644"
     variables(
       :path => "#{new_resource.path}/current",
+      :docroot => relative_docroot,
       :host => host,
       :database => new_resource.database
     )

resources/mod_php_apache2.rb

@@ -22,3 +22,5 @@
 attribute :server_aliases, :kind_of => [Array, NilClass], :default => nil
 # Actually defaults to "php.conf.erb", but nil means it wasn't set by the user
 attribute :webapp_template, :kind_of => [String, NilClass], :default => nil
+# docroot: set when the http docroot is a subdir of the deployed app
+attribute :docroot, :kind_of => [String, NilClass], :default => nil

resources/php.rb

@@ -24,6 +24,8 @@
 # Actually defaults to "#{local_settings_file_name}.erb", but nil means it wasn't set by the user
 attribute :settings_template, :kind_of => [String, NilClass], :default => nil
 attribute :packages, :kind_of => [Array, Hash], :default => []
+# docroot: set when the http docroot is a subdir of the deployed app
+attribute :docroot, :kind_of => [String, NilClass], :default => nil
 
 def local_settings_file_name
   @local_settings_file_name ||= local_settings_file.split(/[\\\/]/).last