Permalink
Browse files

Merge branch 'master' of git://github.com/gondoi/drupal-cookbook into…

… gondoi-master
  • Loading branch information...
2 parents 4e3b0f9 + 1bb9595 commit 3d903dd197864e206f4c49c028972437c757fac4 @mdxp mdxp committed Nov 3, 2012
Showing with 4 additions and 3 deletions.
  1. +2 −2 metadata.rb
  2. +1 −0 recipes/default.rb
  3. +1 −1 templates/default/drupal.conf.erb
View
@@ -3,12 +3,12 @@
license "Apache 2.0"
description "Installs/Configures drupal"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.1.0"
+version "1.1.1"
recipe "drupal", "Installs and configures Drupal"
recipe "drupal::cron", "Sets up the default drupal cron"
recipe "drupal::drush", "Installs drush - a command line shell and scripting interface for Drupal"
-%w{ php apache2 mysql openssl }.each do |cb|
+%w{ postfix php apache2 mysql openssl }.each do |cb|
depends cb
end
View
@@ -20,6 +20,7 @@
include_recipe %w{apache2 apache2::mod_php5 apache2::mod_rewrite apache2::mod_expires}
include_recipe %w{php php::module_mysql php::module_gd}
+include_recipe "postfix"
include_recipe "drupal::drush"
include_recipe "mysql::server"
@@ -1,6 +1,6 @@
<VirtualHost *:<%= @node[:drupal][:apache][:port] %>>
ServerName <%= @params[:server_name] %>
- ServerAlias <% @params[:server_aliases].each do |a| %><%= "#{a}" %> <% end %>
+ ServerAlias <% [*@params[:server_aliases]].each do |a| %><%= "#{a}" %> <% end %>
DocumentRoot <%= @params[:docroot] %>
<Directory <%= @params[:docroot] %>>

0 comments on commit 3d903dd

Please sign in to comment.