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

This commit is contained in:
William Mantly 2019-07-01 03:31:36 +00:00 committed by Gitea
commit 2262fe78ce
3 changed files with 15 additions and 2 deletions

View File

@ -4,7 +4,7 @@ maintainer_email 'you@example.com'
license 'All Rights Reserved' license 'All Rights Reserved'
description 'Installs/Configures t42-common' description 'Installs/Configures t42-common'
long_description 'Installs/Configures t42-common' long_description 'Installs/Configures t42-common'
version '0.1.5' version '0.1.6'
chef_version '>= 13.0' chef_version '>= 13.0'
depends 'nodejs' depends 'nodejs'

View File

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

View File

@ -41,13 +41,22 @@
</FilesMatch> </FilesMatch>
</IfModule> </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'] %> <% if node['web']['static'] %>
<% node['web']['static'].each do |static| -%> <% node['web']['static'].each do |static| -%>
Alias <%= static['uri'] %> <%= node['working-dir'] %>/<%= static['path'] %> Alias <%= static['uri'] %> <%= node['working-dir'] %>/<%= static['path'] %>
<% end -%> <% end -%>
<% end -%> <% end -%>
<% if node['web']['wsgi'] %> <% if node['web']['wsgi'] %>
WSGIDaemonProcess <%= node['app']['name'] %> python-path=<%= node['python']['working-dir'] %> python-home=<%= node['python']['env_path'] %> WSGIDaemonProcess <%= node['app']['name'] %> python-path=<%= node['python']['working-dir'] %> python-home=<%= node['python']['env_path'] %>