Update cookbooks

cookbooks/mediawiki/recipes/default.rb

@@ -8,61 +8,25 @@
 #
 
 include_recipe "apt"
-include_recipe "apache2"
-include_recipe "apache2::mod_php5"
-include_recipe "apache2::mod_rewrite"
-include_recipe "mysql::server"
-include_recipe "database::mysql"
 
 include_recipe "php::default"
 include_recipe "php::module_apc"
 include_recipe "php::module_mysql"
 
+include_recipe "mediawiki::database"
+
 # Download mediawiki tarball
-remote_file "#{Chef::Config[:file_cache_path]}/" + node['mediawiki']['tarball']['name'] do
+remote_file "#{Chef::Config[:file_cache_path]}/#{node['mediawiki']['tarball']['name']}" do
   source node['mediawiki']['tarball']['url']
+  notifies :run, "bash[extract_mediawiki]", :immediately
 end
 
 # Extract mediawiki tarball
-bash "extract_mediawkiki" do
+bash "extract_mediawiki" do
   user "root"
-	cwd node['apache']['docroot_dir']
-	code "tar -zxf #{Chef::Config[:file_cache_path]}/" + node['mediawiki']['tarball']['name'] 
-	action :run
-end
-
-# Database connection information
-mysql_connection_info = {
-  :host     => 'localhost',
-  :username => 'root',
-  :password => node['mysql']['server_root_password']
-}
-
-# Create new database
-mysql_database node['mediawiki']['database']['name'] do
-  connection mysql_connection_info
-  action :create
-end
-
-# Create new user
-mysql_database_user node['mediawiki']['database']['user']  do
-  connection mysql_connection_info
-	password	node['mediawiki']['database']['password']
-  action 		:create
-end
-  
-# Grant privilages to user
-mysql_database_user node['mediawiki']['database']['user'] do
-  connection    mysql_connection_info
-  database_name node["mediawiki"]["database"]["name"]
-  privileges    [:all]
-  action        :grant
-end
-
-# Add virtualhost
-web_app "mediawiki" do
-  server_name node["mediawiki"]["server_name"]
-  docroot node["mediawiki"]["webdir"]
+  cwd node["mediawiki"]["docroot_dir"]
+  code "tar -zxf #{Chef::Config[:file_cache_path]}/#{node['mediawiki']['tarball']['name']}; chown -R #{node['nginx']['user']}:#{node['nginx']['group']} #{node['mediawiki']['docroot_dir']}"
+  action :nothing
 end
 
 # Additional packages
@@ -70,31 +34,33 @@ case node["platform_family"]
 when "rhel"
   package "php-xml"
   package "libicu-devel"
-	service "apache2" do
-    action :restart
-  end
 when "debian"
   package "libicu-dev"
 end
 
-
 php_pear "intl" do
-    action :install
+  action :install
 end
 
 # Configure mediawiki database
-bash "configure_mediawkiki_database" do
-  user "root"
-	cwd node["mediawiki"]["webdir"]
-  code "php maintenance/install.php" + 
-    " --pass '" + node["mediawiki"]["admin_password"] + 
-    "' --dbname '" + node["mediawiki"]["database"]["name"] + 
-    "' --dbpass '" + node["mediawiki"]["database"]["password"] + 
-    "' --dbuser '" + node["mediawiki"]["database"]["name"] + 
-    "' --server '" + node["mediawiki"]["server"] + 
-    "' --scriptpath '" + node["mediawiki"]["scriptpath"] + 
+bash "configure_mediawiki_database" do
+  user node["nginx"]["user"]
+  cwd node["mediawiki"]["webdir"]
+  code "php maintenance/install.php" +
+    " --pass '" + node["mediawiki"]["admin_password"] +
+    "' --dbname '" + node["mediawiki"]["db"]["name"] +
+    "' --dbpass '" + node["mediawiki"]["db"]["pass"] +
+    "' --dbuser '" + node["mediawiki"]["db"]["user"] +
+    "' --server '" + node["mediawiki"]["server"] +
+    "' --scriptpath '" + node["mediawiki"]["scriptpath"] +
     "' --lang '" + node["mediawiki"]["language_code"] +
     "' '" + node["mediawiki"]["site_name"] + "' '" + node["mediawiki"]["admin_user"] + "'"
-	action :run
+  not_if { File.exist? "#{node["mediawiki"]["webdir"]}/LocalSettings.php" }
+  action :run
 end
 
+file "#{node["mediawiki"]["webdir"]}/LocalSettings.php" do
+  mode "0640"
+  owner node["nginx"]["user"]
+  group node["nginx"]["group"]
+end