From 4df938425f11bdf93bc956d5f0afca5c58465015 Mon Sep 17 00:00:00 2001 From: Tray Torrance Date: Tue, 15 Nov 2011 17:09:48 -0800 Subject: [PATCH] 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'],