From 70fea5699960a976115637ff36f5e8d5dc96d4fc Mon Sep 17 00:00:00 2001
From: Brendan Germain <brendan.germain@nasdaqomx.com>
Date: Fri, 12 Aug 2016 09:42:18 -0400
Subject: [PATCH] allow wp to be hosted in a nested directory

---
 attributes/default.rb | 1 +
 recipes/apache.rb     | 4 ++--
 recipes/nginx.rb      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index 873753d..cb343d5 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -101,3 +101,4 @@
 end
 
 default['wordpress']['php_options'] = { 'php_admin_value[upload_max_filesize]' => '50M', 'php_admin_value[post_max_size]' => '55M' }
+default['wordpress']['webroot'] = node['wordpress']['dir']
diff --git a/recipes/apache.rb b/recipes/apache.rb
index 88acc03..fb7331c 100644
--- a/recipes/apache.rb
+++ b/recipes/apache.rb
@@ -40,14 +40,14 @@
   iis_site 'Wordpress' do
     protocol :http
     port 80
-    path node['wordpress']['dir']
+    path node['wordpress']['webroot']
     application_pool 'WordpressPool'
     action [:add,:start]
   end
 else
   web_app "wordpress" do
     template "wordpress.conf.erb"
-    docroot node['wordpress']['dir']
+    docroot node['wordpress']['webroot']
     server_name node['wordpress']['server_name']
     server_aliases node['wordpress']['server_aliases']
     server_port node['wordpress']['server_port']
diff --git a/recipes/nginx.rb b/recipes/nginx.rb
index 7820a2b..acf6714 100644
--- a/recipes/nginx.rb
+++ b/recipes/nginx.rb
@@ -44,7 +44,7 @@
 template "#{node['nginx']['dir']}/sites-enabled/wordpress.conf" do
   source "nginx.conf.erb"
   variables(
-    :docroot          => node['wordpress']['dir'],
+    :docroot          => node['wordpress']['webroot'],
     :server_name      => node['wordpress']['server_name'],
     :server_aliases   => node['wordpress']['server_aliases'],
     :server_port      => node['wordpress']['server_port']