Merge Request #45

← To merge requests From colab-assets into master
Merged
softwarepublico/softwarepublico!45
Created by Athos

Colab assets

@seocam , a receita estava chamando colab-assets.

Ao convergir a integration eu recebia:

http://ur1.ca/nuqhc

O @rodrigo não observou o mesmo erro.

Após a aplicação do patch, o ambiente converge, mas ainda tenho problemas com JS do noosfero.

Assignee: None
Milestone: None

Merged by Sergio Oliveira

Source branch has been removed
Commits (1)
3 participants
Showing 2 changed files   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   Edit   View file @15086b1
... ... @@ -175,13 +175,13 @@ end
175 175 execute 'colab-admin migrate'
176 176  
177 177 # Static files
178   -directory '/var/lib/colab-assets/spb/' do
  178 +directory '/var/lib/colab/assets/spb/' do
179 179 owner 'root'
180 180 group 'root'
181 181 mode 0755
182 182 end
183 183  
184   -cookbook_file '/var/lib/colab-assets/spb/fav.ico' do
  184 +cookbook_file '/var/lib/colab/assets/spb/fav.ico' do
185 185 owner 'root'
186 186 group 'root'
187 187 mode 0644
... ...
cookbooks/colab/templates/colab.conf.erb
  Diff comments   Edit   View file @15086b1
... ... @@ -12,7 +12,7 @@ server {
12 12 client_max_body_size 150m;
13 13  
14 14 location ~ ^/static/img/fav\.[^.]+\.ico$ {
15   - alias /var/lib/colab-assets/spb/fav.ico;
  15 + alias /var/lib/colab/assets/spb/fav.ico;
16 16 }
17 17  
18 18 location / {
... ...