Commit 10263cde257d4c0941f29845cbbb8ada82a1825b
Exists in
master
and in
54 other branches
Merge branch 'colab-assets' into 'master'
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. See merge request !45
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
cookbooks/colab/recipes/default.rb
| @@ -175,13 +175,13 @@ end | @@ -175,13 +175,13 @@ end | ||
| 175 | execute 'colab-admin migrate' | 175 | execute 'colab-admin migrate' |
| 176 | 176 | ||
| 177 | # Static files | 177 | # Static files |
| 178 | -directory '/var/lib/colab-assets/spb/' do | 178 | +directory '/var/lib/colab/assets/spb/' do |
| 179 | owner 'root' | 179 | owner 'root' |
| 180 | group 'root' | 180 | group 'root' |
| 181 | mode 0755 | 181 | mode 0755 |
| 182 | end | 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 | owner 'root' | 185 | owner 'root' |
| 186 | group 'root' | 186 | group 'root' |
| 187 | mode 0644 | 187 | mode 0644 |
cookbooks/colab/templates/colab.conf.erb
| @@ -12,7 +12,7 @@ server { | @@ -12,7 +12,7 @@ server { | ||
| 12 | client_max_body_size 150m; | 12 | client_max_body_size 150m; |
| 13 | 13 | ||
| 14 | location ~ ^/static/img/fav\.[^.]+\.ico$ { | 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 | location / { | 18 | location / { |