nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2406 from torrancew/sod_fixes

Browse source 
Sod fixes
This commit is contained in:
Michael Sofaer 2011-11-15 19:59:35 -08:00
commit 83ee7702a4
5 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chef/cookbooks/diaspora/recipes/bootstrap.rb
View file

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

2
chef/cookbooks/diaspora/recipes/daemontools.rb
View file

@ -14,7 +14,7 @@ execute "executable" do
command "chmod -R 755 /service/mysql" command "chmod -R 755 /service/mysql"
end 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| config['thins'].each do |thin|
port = thin["port"] port = thin["port"]

0
chef/cookbooks/diaspora/recipes/main.rb → chef/cookbooks/diaspora/recipes/default.rb
View file

2
chef/cookbooks/diaspora/recipes/nginx.rb
View file

@ -26,7 +26,7 @@ execute "change crossdomain.xml permissions" do
command "chmod 755 /usr/local/nginx/html/crossdomain.xml" command "chmod 755 /usr/local/nginx/html/crossdomain.xml"
end 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 template "/usr/local/nginx/conf/nginx.conf" do
source "nginx.conf.erb" 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'], variables :ports => config['thins'].map{|thin| "#{thin["port"]}"}, :url => config['url'], :cert_location => config['cert_location'], :key_location => config['key_location'],

2
chef/cookbooks/diaspora/recipes/splunk.rb
View file

@ -4,7 +4,7 @@ unless system "splunk status"
end end
execute "Download splunk" do 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 end
execute "Untar splunk" do execute "Untar splunk" do