Refactor Chef recipes to utilize natural features of Chef

* Don't use executes for installing packages, use the package resource
* Use node platform attribute to affect platform-specific behavior
* Consolidate into a single cookbook

chef/cookbooks/debian/recipes/nginx.rb

-execute "pcre dependency" do
-  command "apt-get install -y libpcre3 libpcre3-dev"
-end
-include_recipe "common::nginx"

chef/cookbooks/debian/recipes/post_bootstrap.rb

-include_recipe "debian::java"

chef/cookbooks/debian/recipes/redis.rb

-execute "download redis" do
-  command "wget http://ftp.us.debian.org/debian/pool/main/r/redis/redis-server_2.2.2-1_amd64.deb"
-end
-
-execute "install redis" do
-  command "dpkg -i redis-server_2.2.2-1_amd64.deb"
-end
-
-cookbook_file "/usr/local/etc/redis.conf" do
-  source "redis.conf"
-end
-
-execute "change redis.conf permissions" do
-  command "chmod 755 /usr/local/etc/redis.conf"
-end
-
-execute "make the redis db directory" do
-  command "mkdir -p /usr/local/var/db/redis"
-end

chef/cookbooks/diaspora/bootstrap.json

+{"run_list": ["recipe[diaspora::bootstrap"]}

chef/cookbooks/diaspora/main.json

+{"run_list": ["recipe[diaspora::main]"]} 

chef/cookbooks/diaspora/recipes/backup.rb

+cron "user stats" do
+  minute 42
+  hour 15
+  command "cd /usr/local/app/diaspora && exec /usr/local/bin/ruby /usr/local/bin/bundle exec rake --trace statistics:users_splunk &> /usr/local/app/diaspora/log/stats.log"
+end
+
+cron "content stats" do
+  minute 42
+  hour 15
+  command "cd /usr/local/app/diaspora && exec /usr/local/bin/ruby /usr/local/bin/bundle exec rake --trace statistics:content_splunk &> /usr/local/app/diaspora/log/stats.log"
+end
+
+cron "backup mysql" do
+  minute 0
+  command "cd /usr/local/app/diaspora && exec /usr/local/bin/ruby /usr/local/bin/bundle exec rake --trace backup:mysql"
+end

chef/cookbooks/centos/recipes/bootstrap.rb → chef/cookbooks/diaspora/recipes/bootstrap.rb

-execute "bundler deps" do
-  command "yum install -y cpio"
-end
-execute "nokogiri deps" do
-  command "yum install -y libxml2-devel libxslt-devel"
-end
-execute "eventmachine deps" do
-  command "yum install -y gcc-c++"
-end
-execute "ssl lib" do
-  command "yum install -y openssl-devel"
-end
-execute "htop" do
-  command "yum install -y htop psmisc screen"
+common_pkgs = [
+  "cpio",
+  "gcc-c++",
+  "htop",
+  "psmisc",
+  "screen",
+  "bzip2"
+]
+
+dev_pkgs = value_for_platform(
+  "debian" => {
+    "default" => [
+      "libxml2-dev",
+      "libxslt-dev",
+      "libssl-dev",
+      "libcurl4-openssl-dev"
+    ]
+  },
+  "centos" => {
+    "default" => [
+      "libxml2-devel",
+      "libxslt-devel",
+      "openssl-devel",
+    ]
+  }
+)
+
+execute "apt-get update" do
+  action :nothing
+end.run_action(:run) if platform?("debian")
+
+common_pkgs.each do |pkg|
+  package pkg
 end
 
-execute "rvm deps" do
-  command "yum install -y bzip2"
+dev_pkgs do |pkg|
+  package pkg
 end
 
 def harden_ruby(ruby_string)
@@ -34,4 +53,4 @@ end
 
 harden_ruby("ree-1.8.7-2010.02")
 
-include_recipe "centos::post_bootstrap"
+include_recipe "diaspora::java"

chef/cookbooks/centos/recipes/curl.rb → chef/cookbooks/diaspora/recipes/curl.rb

@@ -48,4 +48,4 @@ execute 'rebundle' do
   command 'bundle install'
 end
 
-include_recipe "centos::startcom_bundle"
+include_recipe "diaspora::startcom_bundle"

chef/cookbooks/common/recipes/daemontools.rb → chef/cookbooks/diaspora/recipes/daemontools.rb

@@ -9,6 +9,7 @@ end
 execute "mysql run" do
   command "mkdir -p /service/mysql && echo '#!/bin/sh' > /service/mysql/run && echo 'exec /usr/libexec/mysqld --datadir=/var/lib/mysql --socket=/var/lib/mysql/mysql.sock --log-error=/var/log/mysqld.log --pid-file=/var/run/mysqld/mysqld.pid --user=mysql'  >> /service/mysql/run"
 end
+
 execute "executable" do
   command "chmod -R 755 /service/mysql"
 end

chef/cookbooks/diaspora/recipes/image_magick.rb

+package "imagemagick" do
+  case node['platform']
+  when "debian"
+    package_name "imagemagick"
+  when "centos"
+    package_name "ImageMagick"
+  end
+end
+
+if platform?("debian")
+  package "libmagick9-dev"
+end

chef/cookbooks/diaspora/recipes/iptables.rb

+if platform?("centos")
+
+  cookbook_file "/etc/sysconfig/iptables" do
+    source "iptables"
+    notifies :run, "execute[restart iptables]", :immediately
+  end
+
+  execute "restart iptables" do
+    command "/etc/init.d/iptables restart"
+  end
+
+end

chef/cookbooks/diaspora/recipes/java.rb

+package "java"

chef/cookbooks/diaspora/recipes/main.rb

+include_recipe "diaspora::image_magick"
+include_recipe "diaspora::mysql"
+include_recipe "diaspora::iptables"
+include_recipe "diaspora::daemontools"
+include_recipe "diaspora::splunk"
+include_recipe "diaspora::backup"
+include_recipe "diaspora::nginx"
+include_recipe "diaspora::redis"
+include_recipe "diaspora::curl" if platform?("centos")

chef/cookbooks/diaspora/recipes/mysql.rb

+mysql_pkgs = value_for_platform(
+  "debian" => { "default" => %w[mysql-server libmysqlclient-dev libmysql-ruby] },
+  "centos" => { "default" => %w[mysql mysql-server mysql-devel] }
+)
+
+if platform?("centos")
+  
+  execute "start mysql service to create the system tables" do
+    command "service mysqld start"
+  end
+  
+  execute "stop service again" do
+    command "service mysqld stop"
+  end
+
+end