diff --git a/metadata.rb b/metadata.rb index e2eb824..51e84b5 100644 --- 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.3' +version '0.1.4' chef_version '>= 13.0' depends 'nodejs' diff --git a/recipes/php.rb b/recipes/php.rb new file mode 100644 index 0000000..ebb0e80 --- /dev/null +++ b/recipes/php.rb @@ -0,0 +1,6 @@ +[ + 'php', + 'libapache2-mod-php', +].each do |pkg| + apt_package pkg +end diff --git a/templates/apache/vhost.conf.erb b/templates/apache/vhost.conf.erb index 4e7de90..bab179c 100644 --- a/templates/apache/vhost.conf.erb +++ b/templates/apache/vhost.conf.erb @@ -41,11 +41,13 @@ + <% if node['web']['static'] %> <% node['web']['static'].each do |static| -%> Alias <%= static['uri'] %> <%= node['working-dir'] %>/<%= static['path'] %> <% end -%> - + <% end -%> + <% if node['web']['wsgi'] %> WSGIDaemonProcess <%= node['app']['name'] %> python-path=<%= node['python']['working-dir'] %> python-home=<%= node['python']['env_path'] %>