Download as
Browse Code »

Commit 03e701e0d6eaa84c32f5864c238ab0bb4b7940ea

Authored by Sergio Oliveira
2 parents a7b28c0c 10387ca5
Exists in master and in 66 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, button_suspension_points_remove, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, mailinglist_page_title, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Merge remote-tracking branch 'origin' into fix_external_firewall

Showing 2 changed files with 9 additions and 2 deletions   Show diff stats
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 3
4 require 'yaml' 4 require 'yaml'
5 5
  6 +load './local.rake' if File.exists?('local.rake')
  7 +if ENV['SPB_ENV'] == 'lxc'
  8 + system('sudo', '-v')
  9 +end
  10 +
6 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing! 11 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
7 VAGRANTFILE_API_VERSION = "2" 12 VAGRANTFILE_API_VERSION = "2"
8 13
@@ -13,7 +18,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -13,7 +18,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
13 config.vm.provision 'shell', path: 'utils/proxy.sh', args: [proxy] 18 config.vm.provision 'shell', path: 'utils/proxy.sh', args: [proxy]
14 end 19 end
15 20
16 - load './local.rake' if File.exists?('local.rake')  
17 env = ENV.fetch('SPB_ENV', 'local') 21 env = ENV.fetch('SPB_ENV', 'local')
18 22
19 if File.exist?("config/#{env}/ips.yaml") 23 if File.exist?("config/#{env}/ips.yaml")
cookbooks/noosfero/recipes/default.rb
  Diff comments   View file @03e701e
@@ -43,7 +43,10 @@ execute 'plugins:enable' do @@ -43,7 +43,10 @@ execute 'plugins:enable' do
43 end 43 end
44 44
45 execute 'plugins:activate' do 45 execute 'plugins:activate' do
46 - command "RAILS_ENV=production bundle exec rake noosfero:plugins:enable_all_plugins" 46 + command "RAILS_ENV=production bundle exec rake noosfero:plugins:enable_all_plugins"
  47 + cwd '/usr/lib/noosfero'
  48 + user 'noosfero'
  49 + only_if 'bundle rake -T | grep enable_all_plugins'
47 end 50 end
48 51
49 execute 'theme:enable' do 52 execute 'theme:enable' do