diff --git a/chef/cookbooks/diaspora/recipes/bootstrap.rb b/chef/cookbooks/diaspora/recipes/bootstrap.rb index 5f9852740..0a965b965 100644 --- a/chef/cookbooks/diaspora/recipes/bootstrap.rb +++ b/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" ] 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/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 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'], 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