Merge pull request #2406 from torrancew/sod_fixes

Sod fixes

chef/cookbooks/diaspora/recipes/bootstrap.rb

@@ -11,7 +11,9 @@ dev_pkgs = value_for_platform(
   "debian" => {
     "default" => [
       "libxml2-dev",
-      "libxslt-dev",
+      "libxslt1-dev",
+      "libsqlite3-dev",
+      "libmysqlclient-dev",
       "libssl-dev",
       "libcurl4-openssl-dev"
     ]

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"]

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'],

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