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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
zhitomirskiyi 2011-01-28 13:46:33 -08:00
commit c3a30bb481
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chef/cookbooks/centos/recipes/bootstrap.rb
View file

@ -19,6 +19,9 @@ end
execute "rvm deps" do execute "rvm deps" do
command "yum install -y bzip2" command "yum install -y bzip2"
end end
execute "install mysql" do
command "yum install -y mysql mysql-server mysql-devel"
end
def harden_ruby(ruby_string) def harden_ruby(ruby_string)
Dir.glob("/usr/local/rvm/wrappers/#{ruby_string}/*").each do |file| Dir.glob("/usr/local/rvm/wrappers/#{ruby_string}/*").each do |file|

2
chef/cookbooks/common/files/default/thins.yml
View file

@ -6,4 +6,4 @@ url: 'joindiaspora.com'
cert_location: '/usr/local/nginx/conf/diaspora.crt' cert_location: '/usr/local/nginx/conf/diaspora.crt'
key_location: '/usr/local/nginx/conf/diaspora.key' key_location: '/usr/local/nginx/conf/diaspora.key'
s3_bucket: "https://joindiaspora.s3.amazonaws.com" s3_bucket: "https://joindiaspora.s3.amazonaws.com"
s3_path: "/uploads/images/' s3_path: "/uploads/images/"

13
chef/cookbooks/common/recipes/daemontools.rb
View file

@ -6,11 +6,18 @@ execute "compile daemontools" do
command "cd /package/admin/daemontools-0.76 && ./package/install" command "cd /package/admin/daemontools-0.76 && ./package/install"
end end
execute "mongo run" do #execute "mongo run" do
command "mkdir -p /service/mongo && echo '#!/bin/sh' > /service/mongo/run && echo 'exec /usr/bin/mongod' >> /service/mongo/run" # command "mkdir -p /service/mongo && echo '#!/bin/sh' > /service/mongo/run && echo 'exec /usr/bin/mongod' >> /service/mongo/run"
#end
#execute "executable" do
# command "chmod -R 755 /service/mongo"
#end
execute "mysql run" do
command "mkdir -p /service/mysql && echo '#!/bin/sh' > /service/mysql/run && echo 'exec /usr/bin/mysqld_safe --datadir=/var/lib/mysql --socket=/var/lib/mysql/mysql.sock --log-error=/var/log/mysqld.log --pid-file=/var/run/mysqld/mysqld.pid --user=mysql' >> /service/mysql/run"
end end
execute "executable" do execute "executable" do
command "chmod -R 755 /service/mongo" 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/common/files/default/thins.yml")

4
chef/cookbooks/common/templates/default/nginx.conf.erb
View file

@ -90,7 +90,7 @@ http {
location /assets { location /assets {
expires 1d; expires 1d;
add_header Cache-Control public add_header Cache-Control public;
} }
location / { location / {
@ -114,7 +114,7 @@ http {
} }
<% unless @s3_bucket.blank? || @s3_path.blank? %> <% unless @s3_bucket.blank? || @s3_path.blank? %>
<%= "rewrite ^/uploads/images/(.*)$ #{@s3_bucket}#{@s3_path}$1 permanent; %> <%= "rewrite ^/uploads/images/(.*)$ #{@s3_bucket}#{@s3_path}$1 permanent;" %>
<% end %> <% end %>
} }