Merge branch 'apache-root' of theta42/t42-common into master

2019-07-01 03:47:43 +00:00 · 2019-07-01 03:47:43 +00:00 · 45e472399e
commit 45e472399e
parent 2262fe78ce c41052330e
2 changed files with 5 additions and 1 deletions
--- a/metadata.rb
+++ b/metadata.rb
@ -4,7 +4,7 @@ maintainer_email 'you@example.com'
 license 'All Rights Reserved'
 description 'Installs/Configures t42-common'
 long_description 'Installs/Configures t42-common'
-version '0.1.6'
+version '0.1.7'
 chef_version '>= 13.0'

 depends 'nodejs'
--- a/recipes/php.rb
+++ b/recipes/php.rb
@ -1,3 +1,7 @@
+unless node['php']['working-dir'][0] == '/'
+	node.override['php']['working-dir'] = "#{node['working-dir']}/#{node['php']['working-dir']}"
+end
+
 [
 	'php',
 	'libapache2-mod-php',