Permalink
Browse files

updated drupal version to 7.10

  • Loading branch information...
mdxp committed Mar 6, 2012
1 parent 182c176 commit 11b26664ac53fb15e5038009400ea920d09cdf46
Showing with 143 additions and 2 deletions.
  1. +5 −2 drupal/attributes/default.rb
  2. +138 −0 drupal/recipes/default.rb
@@ -18,11 +18,14 @@
# limitations under the License.
#
-default[:drupal][:version] = "7.0"
-default[:drupal][:checksum] = "62e4146b2a2208d0772cef6578205b369f361b2079bf3fa9408e92f5419902e8"
+default[:drupal][:version] = "7.10"
+default[:drupal][:checksum] = "de648c9944ef00ccf6af0fd7cee19a950eae613e1fa7c75dacbe56e4820c8eba"
default[:drupal][:dir] = "/var/www/drupal"
default[:drupal][:db][:database] = "drupal"
default[:drupal][:db][:user] = "drupal"
+default[:drupal][:site][:admin] = "admin"
+default[:drupal][:site][:pass] = "drupaladmin"
+default[:drupal][:site][:name] = "Drupal7"
::Chef::Node.send(:include, Opscode::OpenSSL::Password)
View
@@ -0,0 +1,138 @@
+#
+# Author:: Marius Ducea (marius@promethost.com)
+# Cookbook Name:: drupal
+# Recipe:: default
+#
+# Copyright 2010, Promet Solutions
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+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 "drupal::drush"
+include_recipe "mysql::server"
+#Gem.clear_paths
+#require 'mysql'
+
+execute "mysql-install-drupal-privileges" do
+ command "/usr/bin/mysql -u root -p#{node[:mysql][:server_root_password]} < /etc/mysql/drupal-grants.sql"
+ action :nothing
+end
+
+template "/etc/mysql/drupal-grants.sql" do
+ path "/etc/mysql/drupal-grants.sql"
+ source "grants.sql.erb"
+ owner "root"
+ group "root"
+ mode "0600"
+ variables(
+ :user => node[:drupal][:db][:user],
+ :password => node[:drupal][:db][:password],
+ :database => node[:drupal][:db][:database]
+ )
+ notifies :run, resources(:execute => "mysql-install-drupal-privileges"), :immediately
+end
+
+#mysql_database "create #{node[:drupal][:db][:database]} database" do
+# host "localhost"
+# username "root"
+# password node[:mysql][:server_root_password]
+# database node[:drupal][:db][:database]
+# action :create_db
+#end
+
+execute "create #{node[:drupal][:db][:database]} database" do
+ command "/usr/bin/mysqladmin -u root -p#{node[:mysql][:server_root_password]} create #{node[:drupal][:db][:database]}"
+ not_if do
+ m = Mysql.new("localhost", "root", node[:mysql][:server_root_password])
+ m.list_dbs.include?(node[:drupal][:db][:database])
+ end
+end
+
+#install drupal
+#remote_file "#{node[:drupal][:src]}/drupal-#{node[:drupal][:version]}.tar.gz" do
+# checksum node[:drupal][:checksum]
+# source "http://ftp.drupal.org/files/projects/drupal-#{node[:drupal][:version]}.tar.gz"
+# mode "0644"
+#end
+
+#directory "#{node[:drupal][:dir]}" do
+# owner "root"
+# group "root"
+# mode "0755"
+# action :create
+#end
+
+execute "download-and-install-drupal" do
+ cwd File.dirname(node[:drupal][:dir])
+ command "#{node[:drupal][:drush][:dir]}/drush -y dl drupal-#{node[:drupal][:version]} --destination=#{File.dirname(node[:drupal][:dir])} --drupal-project-rename=#{File.basename(node[:drupal][:dir])} && \
+ #{node[:drupal][:drush][:dir]}/drush -y site-install -r #{node[:drupal][:dir]} --account-name=#{node[:drupal][:site][:admin]} --account-pass=#{node[:drupal][:site][:pass]} --site-name=#{node[:drupal][:site][:name]} \
+ --db-url=mysql://#{node[:drupal][:db][:user]}:'#{node[:drupal][:db][:password]}'@localhost/#{node[:drupal][:db][:database]}"
+ not_if "#{node[:drupal][:drush][:dir]}/drush -r #{node[:drupal][:dir]} status | grep #{node[:drupal][:version]}"
+end
+
+if node.has_key?("ec2")
+ server_fqdn = node.ec2.public_hostname
+else
+ server_fqdn = node.fqdn
+end
+
+#log "Navigate to 'http://#{server_fqdn}/install.php' to complete the drupal installation" do
+# action :nothing
+#end
+
+directory "#{node[:drupal][:dir]}/sites/default/files" do
+ mode "0777"
+ action :create
+end
+
+#template "#{node[:drupal][:dir]}/sites/default/settings.php" do
+# source "settings.php.erb"
+# mode "0644"
+# variables(
+# :database => node[:drupal][:db][:database],
+# :user => node[:drupal][:db][:user],
+# :password => node[:drupal][:db][:password]
+# )
+# notifies :write, resources(:log => "Navigate to 'http://#{server_fqdn}/install.php' to complete the drupal installation")
+#end
+
+if node[:drupal][:modules]
+ node[:drupal][:modules].each do |m|
+ if m.is_a?Array
+ drupal_module m.first do
+ version m.last
+ dir node[:drupal][:dir]
+ end
+ else
+ drupal_module m do
+ dir node[:drupal][:dir]
+ end
+ end
+ end
+end
+
+web_app "drupal" do
+ template "drupal.conf.erb"
+ docroot "#{node[:drupal][:dir]}"
+ server_name server_fqdn
+ server_aliases node.fqdn
+end
+
+include_recipe "drupal::cron"
+
+execute "disable-default-site" do
+ command "sudo a2dissite default"
+ notifies :reload, resources(:service => "apache2"), :delayed
+end

0 comments on commit 11b2666

Please sign in to comment.