Download as
Browse Code »

Commit 895b1e2ecf7dcd788848c388a07a7d6ad1f9eddc

Authored by Rodrigo Siqueira de Melo
2 parents 6e083ed5 9a94c93c
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Merge branch 'update_noosfero_unicorn'

Showing 5 changed files with 24 additions and 22 deletions   Show diff stats
cookbooks/noosfero/files/unicorn.rb 0 → 100644
  Diff comments   View file @895b1e2
... ... @@ -0,0 +1,3 @@
  1 +listen "127.0.0.1:9000"
  2 +
  3 +worker_processes `nproc`.to_i
... ...
cookbooks/noosfero/recipes/default.rb
  Diff comments   View file @895b1e2
... ... @@ -40,11 +40,11 @@ plugins = [
40 40 'people_block',
41 41 'recent_content',
42 42 'remote_user',
43   - 'software_communities', # from noosfero-spb
  43 + 'organization_ratings',
44 44 'statistics',
45 45 'sub_organizations',
46 46 'video',
47   - 'spb_migrations',
  47 + 'community_block',
48 48 ]
49 49  
50 50 execute 'plugins:enable' do
... ... @@ -64,6 +64,22 @@ execute 'plugins:activate' do
64 64 only_if 'bundle exec rake -P | grep enable_all'
65 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 83 execute 'theme:enable' do
68 84 command 'psql -h database -U noosfero --no-align --tuples-only -q -c "update environments set theme=\'noosfero-spb-theme\' where id=1;"'
69 85 end
... ... @@ -73,7 +89,7 @@ execute 'software:create_licenses' do
73 89 command 'sudo -u noosfero bundle exec rake software:create_licenses RAILS_ENV=production'
74 90 end
75 91  
76   -template '/etc/noosfero/thin.yml' do
  92 +template '/etc/noosfero/unicorn.rb' do
77 93 owner 'root'; group 'root'; mode 0644
78 94 notifies :restart, 'service[noosfero]'
79 95 end
... ...
cookbooks/noosfero/templates/nginx.conf.erb
  Diff comments   View file @895b1e2
1 1 # MANAGED WITH CHEF; DO NOT CHANGE BY HAND
2 2  
3 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 7 server {
... ...
cookbooks/noosfero/templates/thin.yml.erb
View file @6e083ed
... ... @@ -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
  Diff comments   View file @895b1e2
... ... @@ -5,7 +5,7 @@ test_database_connectivity() {
5 5 }
6 6  
7 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 11 test_noosfero_on_subdir() {
... ...