From a197f16e5fd2238ba69c523416d79d91591f694d Mon Sep 17 00:00:00 2001 From: Tray Torrance Date: Tue, 15 Nov 2011 16:26:31 -0800 Subject: [PATCH 1/5] Renames main.rb to default.rb for sod --- chef/cookbooks/diaspora/recipes/{main.rb => default.rb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename chef/cookbooks/diaspora/recipes/{main.rb => default.rb} (100%) diff --git a/chef/cookbooks/diaspora/recipes/main.rb b/chef/cookbooks/diaspora/recipes/default.rb similarity index 100% rename from chef/cookbooks/diaspora/recipes/main.rb rename to chef/cookbooks/diaspora/recipes/default.rb From 4df938425f11bdf93bc956d5f0afca5c58465015 Mon Sep 17 00:00:00 2001 From: Tray Torrance Date: Tue, 15 Nov 2011 17:09:48 -0800 Subject: [PATCH 2/5] Changed references for common cookbook to diaspora cookbook --- chef/cookbooks/diaspora/recipes/daemontools.rb | 2 +- chef/cookbooks/diaspora/recipes/nginx.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chef/cookbooks/diaspora/recipes/daemontools.rb b/chef/cookbooks/diaspora/recipes/daemontools.rb index c07371f16..23a5aeb92 100644 --- a/chef/cookbooks/diaspora/recipes/daemontools.rb +++ b/chef/cookbooks/diaspora/recipes/daemontools.rb @@ -14,7 +14,7 @@ execute "executable" do command "chmod -R 755 /service/mysql" end -config = YAML.load_file("/usr/local/app/diaspora/chef/cookbooks/common/files/default/thins.yml") +config = YAML.load_file("/usr/local/app/diaspora/chef/cookbooks/diaspora/files/default/thins.yml") config['thins'].each do |thin| port = thin["port"] diff --git a/chef/cookbooks/diaspora/recipes/nginx.rb b/chef/cookbooks/diaspora/recipes/nginx.rb index df2b41aa2..f1023fd5a 100644 --- a/chef/cookbooks/diaspora/recipes/nginx.rb +++ b/chef/cookbooks/diaspora/recipes/nginx.rb @@ -26,7 +26,7 @@ execute "change crossdomain.xml permissions" do command "chmod 755 /usr/local/nginx/html/crossdomain.xml" end -config = YAML.load_file("/usr/local/app/diaspora/chef/cookbooks/common/files/default/thins.yml") +config = YAML.load_file("/usr/local/app/diaspora/chef/cookbooks/diaspora/files/default/thins.yml") template "/usr/local/nginx/conf/nginx.conf" do source "nginx.conf.erb" variables :ports => config['thins'].map{|thin| "#{thin["port"]}"}, :url => config['url'], :cert_location => config['cert_location'], :key_location => config['key_location'], From 2d54132abe0b660035c689a2e50b7a58f180faef Mon Sep 17 00:00:00 2001 From: Tray Torrance Date: Tue, 15 Nov 2011 17:10:49 -0800 Subject: [PATCH 3/5] Added known necessary debian packages --- chef/cookbooks/diaspora/recipes/bootstrap.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chef/cookbooks/diaspora/recipes/bootstrap.rb b/chef/cookbooks/diaspora/recipes/bootstrap.rb index 5f9852740..7a82b62e2 100644 --- a/chef/cookbooks/diaspora/recipes/bootstrap.rb +++ b/chef/cookbooks/diaspora/recipes/bootstrap.rb @@ -10,8 +10,11 @@ common_pkgs = [ dev_pkgs = value_for_platform( "debian" => { "default" => [ + "ruby-full", "libxml2-dev", - "libxslt-dev", + "libxslt1-dev", + "libsqlite3-dev", + "libmysqlclient-dev", "libssl-dev", "libcurl4-openssl-dev" ] From 7956c234bd910baa4e9158342d423bd56b2ef12f Mon Sep 17 00:00:00 2001 From: Tray Torrance Date: Tue, 15 Nov 2011 17:23:30 -0800 Subject: [PATCH 4/5] Adjusts splunk chef recipe to name the splunk download properly --- chef/cookbooks/diaspora/recipes/splunk.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chef/cookbooks/diaspora/recipes/splunk.rb b/chef/cookbooks/diaspora/recipes/splunk.rb index 04d6354a4..5142437e4 100644 --- a/chef/cookbooks/diaspora/recipes/splunk.rb +++ b/chef/cookbooks/diaspora/recipes/splunk.rb @@ -4,7 +4,7 @@ unless system "splunk status" end execute "Download splunk" do - command "cd /tmp/install && wget 'http://www.splunk.com/index.php/download_track?file=4.1.5/linux/splunk-4.1.5-85165-Linux-x86_64.tgz&ac=&wget=true&name=wget&typed=releases'" + command "cd /tmp/install && wget 'http://www.splunk.com/index.php/download_track?file=4.1.5/linux/splunk-4.1.5-85165-Linux-x86_64.tgz&ac=&wget=true&name=wget&typed=releases' -O splunk-4.1.5-85165-Linux-x86_64.tgz" end execute "Untar splunk" do From 6dc00e84d8220e84f0b32b2f00239d3530b0f54d Mon Sep 17 00:00:00 2001 From: Tray Torrance Date: Tue, 15 Nov 2011 19:40:22 -0800 Subject: [PATCH 5/5] Removes ruby-full: sod installs ruby; Cleans up whitespace on other debian packages --- chef/cookbooks/diaspora/recipes/bootstrap.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/chef/cookbooks/diaspora/recipes/bootstrap.rb b/chef/cookbooks/diaspora/recipes/bootstrap.rb index 7a82b62e2..0a965b965 100644 --- a/chef/cookbooks/diaspora/recipes/bootstrap.rb +++ b/chef/cookbooks/diaspora/recipes/bootstrap.rb @@ -10,11 +10,10 @@ common_pkgs = [ dev_pkgs = value_for_platform( "debian" => { "default" => [ - "ruby-full", "libxml2-dev", "libxslt1-dev", - "libsqlite3-dev", - "libmysqlclient-dev", + "libsqlite3-dev", + "libmysqlclient-dev", "libssl-dev", "libcurl4-openssl-dev" ]