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

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.5'
+version '0.1.6'
 chef_version '>= 13.0'
 
 depends 'nodejs'

recipes/php.rb

@@ -4,3 +4,7 @@
 ].each do |pkg|
 	apt_package pkg
 end
+
+systemd_unit 'apache2.service' do
+	action :restart
+end

templates/apache/vhost.conf.erb

@@ -41,6 +41,15 @@
       </FilesMatch>
     </IfModule>
 
+    <% if node['web']['root'] %>
+    DocumentRoot <%= node['web']['root'] %>
+    <Directory <%= node['web']['root'] %>/>
+    Options Indexes FollowSymLinks
+    AllowOverride None
+    Require all granted
+    </Directory>
+    <% end - %>
+
     <% if node['web']['static'] %>
     <% node['web']['static'].each do |static| -%>
     Alias <%= static['uri'] %> <%= node['working-dir'] %>/<%= static['path'] %>