substitute colab-assets dir for solab/assets

Athos
1 parent 8e37b772
Showing 2 changed files with 3 additions and 3 deletions Show diff stats
cookbooks/colab/recipes/default.rb
cookbooks/colab/templates/colab.conf.erb
@@ -175,13 +175,13 @@ end
 execute 'colab-admin migrate'
 # Static files
-directory '/var/lib/colab-assets/spb/' do
+directory '/var/lib/colab/assets/spb/' do
   owner  'root'
   group  'root'
   mode   0755
 end
-cookbook_file '/var/lib/colab-assets/spb/fav.ico' do
+cookbook_file '/var/lib/colab/assets/spb/fav.ico' do
   owner 'root'
   group 'root'
   mode 0644
@@ -12,7 +12,7 @@ server {
   client_max_body_size  150m;
   location ~ ^/static/img/fav\.[^.]+\.ico$ {
-    alias /var/lib/colab-assets/spb/fav.ico;
+    alias /var/lib/colab/assets/spb/fav.ico;
   }
   location / {
	@@ -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
	@@ -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 / {