Replacing logo and favico using nginx alias

Sergio Oliveira
1 parent c581e161
Showing 3 changed files with 21 additions and 2 deletions Show diff stats
cookbooks/colab/files/default/fav.ico
cookbooks/colab/recipes/default.rb
cookbooks/colab/templates/colab.conf.erb
@@ -41,11 +41,22 @@ template &#39;/etc/colab/settings.d/01-apps.yaml&#39; 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'
@@ -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;
...	...	@@ -41,11 +41,22 @@ template '/etc/colab/settings.d/01-apps.yaml' do
41	41	notifies :restart, 'service[colab]'
42	42	end
43	43
44		-cookbook_file '/usr/lib/colab/lib/python2.7/site-packages/colab/static/img/logo.svg' do
	44	+directory '/var/lib/colab-assets/spb/' do
	45	+ owner 'root'
	46	+ group 'root'
	47	+ mode 0755
	48	+end
	49	+
	50	+cookbook_file '/var/lib/colab-assets/spb/logo.svg' do
	51	+ owner 'root'
	52	+ group 'root'
	53	+ mode 0644
	54	+end
	55	+
	56	+cookbook_file '/var/lib/colab-assets/spb/fav.ico' do
45	57	owner 'root'
46	58	group 'root'
47	59	mode 0644
48		- notifies :run, 'execute[colab-admin:collectstatic]'
49	60	end
50	61
51	62	execute 'colab-admin migrate'
...	...
...	...	@@ -10,6 +10,14 @@ server {
10	10	access_log /var/log/nginx/colab.access.log;
11	11	error_log /var/log/nginx/colab.error.log;
12	12
	13	+ location ~ ^/static/img/logo\.[^.]+\.svg$ {
	14	+ alias /var/lib/colab-assets/spb/logo.svg;
	15	+ }
	16	+
	17	+ location ~ ^/static/img/fav\.[^.]+\.ico$ {
	18	+ alias /var/lib/colab-assets/spb/fav.ico;
	19	+ }
	20	+
13	21	location / {
14	22	root /usr/share/nginx/colab;
15	23	try_files $uri @colab-app;
...	...