Commit 895b1e2ecf7dcd788848c388a07a7d6ad1f9eddc
Exists in
master
and in
79 other branches
Merge branch 'update_noosfero_unicorn'
Showing
5 changed files
with
24 additions
and
22 deletions
Show diff stats
cookbooks/noosfero/recipes/default.rb
| @@ -40,11 +40,11 @@ plugins = [ | @@ -40,11 +40,11 @@ plugins = [ | ||
| 40 | 'people_block', | 40 | 'people_block', |
| 41 | 'recent_content', | 41 | 'recent_content', |
| 42 | 'remote_user', | 42 | 'remote_user', |
| 43 | - 'software_communities', # from noosfero-spb | 43 | + 'organization_ratings', |
| 44 | 'statistics', | 44 | 'statistics', |
| 45 | 'sub_organizations', | 45 | 'sub_organizations', |
| 46 | 'video', | 46 | 'video', |
| 47 | - 'spb_migrations', | 47 | + 'community_block', |
| 48 | ] | 48 | ] |
| 49 | 49 | ||
| 50 | execute 'plugins:enable' do | 50 | execute 'plugins:enable' do |
| @@ -64,6 +64,22 @@ execute 'plugins:activate' do | @@ -64,6 +64,22 @@ execute 'plugins:activate' do | ||
| 64 | only_if 'bundle exec rake -P | grep enable_all' | 64 | only_if 'bundle exec rake -P | grep enable_all' |
| 65 | end | 65 | end |
| 66 | 66 | ||
| 67 | + | ||
| 68 | +plugins_spb = [ | ||
| 69 | + 'software_communities', | ||
| 70 | + 'gov_user', | ||
| 71 | + 'spb_migrations', | ||
| 72 | +] | ||
| 73 | + | ||
| 74 | +#FIXME: We did it, because we have to enable each plugin and migrate it separately. | ||
| 75 | +plugins_spb.each do |plugin| | ||
| 76 | + execute ('plugins_spb:activate:' + plugin) do | ||
| 77 | + command '/usr/lib/noosfero/script/noosfero-plugin enable ' + plugin + | ||
| 78 | + ' && RAILS_ENV=production SCHEMA=/dev/null bundle exec ' + | ||
| 79 | + 'rake db:migrate' | ||
| 80 | + end | ||
| 81 | +end | ||
| 82 | + | ||
| 67 | execute 'theme:enable' do | 83 | execute 'theme:enable' do |
| 68 | command 'psql -h database -U noosfero --no-align --tuples-only -q -c "update environments set theme=\'noosfero-spb-theme\' where id=1;"' | 84 | command 'psql -h database -U noosfero --no-align --tuples-only -q -c "update environments set theme=\'noosfero-spb-theme\' where id=1;"' |
| 69 | end | 85 | end |
| @@ -73,7 +89,7 @@ execute 'software:create_licenses' do | @@ -73,7 +89,7 @@ execute 'software:create_licenses' do | ||
| 73 | command 'sudo -u noosfero bundle exec rake software:create_licenses RAILS_ENV=production' | 89 | command 'sudo -u noosfero bundle exec rake software:create_licenses RAILS_ENV=production' |
| 74 | end | 90 | end |
| 75 | 91 | ||
| 76 | -template '/etc/noosfero/thin.yml' do | 92 | +template '/etc/noosfero/unicorn.rb' do |
| 77 | owner 'root'; group 'root'; mode 0644 | 93 | owner 'root'; group 'root'; mode 0644 |
| 78 | notifies :restart, 'service[noosfero]' | 94 | notifies :restart, 'service[noosfero]' |
| 79 | end | 95 | end |
cookbooks/noosfero/templates/nginx.conf.erb
| 1 | # MANAGED WITH CHEF; DO NOT CHANGE BY HAND | 1 | # MANAGED WITH CHEF; DO NOT CHANGE BY HAND |
| 2 | 2 | ||
| 3 | upstream noosfero { | 3 | upstream noosfero { |
| 4 | -<% (1..(`nproc`.strip.to_i)).each do |p| %> | ||
| 5 | - server 127.0.0.1:<%= 9000 + p - 1 %> fail_timeout=10s; | ||
| 6 | -<% end %> | 4 | + server 127.0.0.1:9000 fail_timeout=10s; |
| 7 | } | 5 | } |
| 8 | 6 | ||
| 9 | server { | 7 | server { |
cookbooks/noosfero/templates/thin.yml.erb
| @@ -1,15 +0,0 @@ | @@ -1,15 +0,0 @@ | ||
| 1 | ---- | ||
| 2 | -chdir: /usr/lib/noosfero | ||
| 3 | -environment: production | ||
| 4 | -address: 127.0.0.1 | ||
| 5 | -port: 9000 | ||
| 6 | -timeout: 30 | ||
| 7 | -log: log/thin.log | ||
| 8 | -pid: tmp/pids/thin.pid | ||
| 9 | -max_conns: 1024 | ||
| 10 | -max_persistent_conns: 512 | ||
| 11 | -require: [] | ||
| 12 | -wait: 30 | ||
| 13 | -daemonize: true | ||
| 14 | -servers: <%= `nproc`.strip %> | ||
| 15 | -prefix: /social |
test/noosfero_test.sh
| @@ -5,7 +5,7 @@ test_database_connectivity() { | @@ -5,7 +5,7 @@ test_database_connectivity() { | ||
| 5 | } | 5 | } |
| 6 | 6 | ||
| 7 | test_noosfero_running() { | 7 | test_noosfero_running() { |
| 8 | - assertTrue 'Noosfero running' 'run_on social pgrep -u noosfero -f thin' | 8 | + assertTrue 'Noosfero running' 'run_on social pgrep -u noosfero -f unicorn' |
| 9 | } | 9 | } |
| 10 | 10 | ||
| 11 | test_noosfero_on_subdir() { | 11 | test_noosfero_on_subdir() { |