From 18c8b6adf50ad824d15c89d731345336431b3fef Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Tue, 3 Mar 2015 15:27:36 -0300 Subject: [PATCH] Replacing logo and favico using nginx alias --- cookbooks/colab/files/default/fav.ico | Bin 0 -> 4606 bytes cookbooks/colab/recipes/default.rb | 15 +++++++++++++-- cookbooks/colab/templates/colab.conf.erb | 8 ++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 cookbooks/colab/files/default/fav.ico diff --git a/cookbooks/colab/files/default/fav.ico b/cookbooks/colab/files/default/fav.ico new file mode 100644 index 0000000..d4f9b19 Binary files /dev/null and b/cookbooks/colab/files/default/fav.ico differ diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb index a83cc40..eaf748b 100644 --- a/cookbooks/colab/recipes/default.rb +++ b/cookbooks/colab/recipes/default.rb @@ -41,11 +41,22 @@ template '/etc/colab/settings.d/01-apps.yaml' do notifies :restart, 'service[colab]' end -cookbook_file '/usr/lib/colab/lib/python2.7/site-packages/colab/static/img/logo.svg' do +directory '/var/lib/colab-assets/spb/' do + owner 'root' + group 'root' + mode 0755 +end + +cookbook_file '/var/lib/colab-assets/spb/logo.svg' do + owner 'root' + group 'root' + mode 0644 +end + +cookbook_file '/var/lib/colab-assets/spb/fav.ico' do owner 'root' group 'root' mode 0644 - notifies :run, 'execute[colab-admin:collectstatic]' end execute 'colab-admin migrate' diff --git a/cookbooks/colab/templates/colab.conf.erb b/cookbooks/colab/templates/colab.conf.erb index 13613d1..1c92f71 100644 --- a/cookbooks/colab/templates/colab.conf.erb +++ b/cookbooks/colab/templates/colab.conf.erb @@ -10,6 +10,14 @@ server { access_log /var/log/nginx/colab.access.log; error_log /var/log/nginx/colab.error.log; + location ~ ^/static/img/logo\.[^.]+\.svg$ { + alias /var/lib/colab-assets/spb/logo.svg; + } + + location ~ ^/static/img/fav\.[^.]+\.ico$ { + alias /var/lib/colab-assets/spb/fav.ico; + } + location / { root /usr/share/nginx/colab; try_files $uri @colab-app; -- libgit2 0.21.2