Commit 03e701e0d6eaa84c32f5864c238ab0bb4b7940ea

Authored by Sergio Oliveira
2 parents a7b28c0c 10387ca5

Merge remote-tracking branch 'origin' into fix_external_firewall

@@ -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
@@ -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