Permalink
Browse files

Merge branch 'master' into 08alpha_bootstrap

  • Loading branch information...
2 parents c85e9cf + 3cca712 commit d9c2738d8f41370f4fd8ba9c754481647d35c57e @jtimberman jtimberman committed Feb 26, 2010
@@ -3,7 +3,7 @@
# Cookbook Name:: wordpress
# Attributes:: wordpress
#
-# Copyright 2009, Opscode, Inc.
+# Copyright 2009-2010, Opscode, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
#
# General settings
+set_unless[:wordpress][:version] = "2.9.2"
+set_unless[:wordpress][:checksum] = "7342627f4a3dca44886c5aca6834cc88671dbd3aa2760182d2fcb9a330807ce1"
set_unless[:wordpress][:dir] = "/var/www/wordpress"
set_unless[:wordpress][:db][:database] = "wordpressdb"
set_unless[:wordpress][:db][:user] = "wordpressuser"
Binary file not shown.
Binary file not shown.
View
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs/Configures wordpress"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.2"
+version "0.3"
depends "php"
depends "apache2"
depends "mysql"
@@ -2,7 +2,7 @@
# Cookbook Name:: wordpress
# Recipe:: default
#
-# Copyright 2010, Opscode, Inc.
+# Copyright 2009-2010, Opscode, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
include_recipe "apache2"
-remote_file "#{Chef::Config[:file_cache_path]}/wordpress-2.8.4.tar.gz" do
- checksum "5b08259749facb38a2209008e227f66c85e178fd502b7fdd5f39c2676d14ab6b"
- source "wordpress-2.8.4.tar.gz"
+remote_file "#{Chef::Config[:file_cache_path]}/wordpress-#{node[:wordpress][:version]}.tar.gz" do
+ checksum node[:wordpress][:checksum]
+ source "wordpress-#{node[:wordpress][:version]}.tar.gz"
mode "0644"
end
@@ -34,7 +34,7 @@
execute "untar-wordpress" do
cwd node[:wordpress][:dir]
- command "tar --strip-components 1 -xzf /tmp/wordpress-2.8.4.tar.gz"
+ command "tar --strip-components 1 -xzf #{Chef::Config[:file_cache_path]}/wordpress-#{node[:wordpress][:version]}.tar.gz"
creates "#{node[:wordpress][:dir]}/wp-settings.php"
end
@@ -47,7 +47,7 @@
Gem.clear_paths
require 'mysql'
-template "/etc/mysql/grants.sql" do
+template "/etc/mysql/wp-grants.sql" do
path "/etc/mysql/wp-grants.sql"
source "grants.sql.erb"
owner "root"
@@ -77,6 +77,10 @@
action :create
end
+log "Navigate to 'http://#{node.fqdn}/wp-admin/install.php' to complete wordpress installation" do
+ action :nothing
+end
+
template "#{node[:wordpress][:dir]}/wp-config.php" do
source "wp-config.php.erb"
owner "root"
@@ -91,6 +95,7 @@
:logged_in_key => node[:wordpress][:keys][:logged_in],
:nonce_key => node[:wordpress][:keys][:nonce]
)
+ notifies :write, resources(:log => "Navigate to 'http://#{node.fqdn}/wp-admin/install.php' to complete installation")
end
include_recipe %w{php::php5 php::module_mysql}

0 comments on commit d9c2738

Please sign in to comment.