Merge remote-tracking branch 'origin/master'

Weblate
2 parents 0f8950a5 191cbc16
Showing 4 changed files with 19 additions and 9 deletions Show diff stats
config/application.rb
debian/control
etc/noosfero/varnish-noosfero.vcl
vendor/plugins/noosfero_caching/init.rb
@@ -111,9 +111,7 @@ module Noosfero
     # Make sure the secret is at least 30 characters and all random,
     # no regular words or you'll be exposed to dictionary attacks.
     config.secret_token = noosfero_session_secret
-    config.action_dispatch.session = {
-      :key    => '_noosfero_session',
-    }
+    config.session_store :cookie_store, :key => '_noosfero_session'
  
     config.time_zone = File.read('/etc/timezone').split("\n").first
     config.active_record.default_timezone = :local
@@ -61,6 +61,11 @@ Depends:
  dbconfig-common,
  adduser,
  exim4 | mail-transport-agent,
+# to minimize upgrade issues:
+ ruby-feedparser (>= 0.7-3~),
+ ruby-eventmachine (>= 0.12.10-4~),
+ ruby-rack (>= 1.4.5-2~),
+ ruby-tzinfo (>= 1.1.0-2~),
  ${misc:Depends}
 Recommends:
  postgresql,
@@ -10,6 +10,13 @@ sub vcl_recv {
   }
 }
  
+sub vcl_deliver {
+  # Force clients to aways hit the server again for HTML pages
+  if (resp.http.Content-Type ~ "^text/html") {
+    set resp.http.Cache-Control = "no-cache";
+  }
+}
+
 sub vcl_error {
     set obj.http.Content-Type = "text/html; charset=utf-8";
  
@@ -49,11 +49,11 @@ module NoosferoHttpCaching
  
     # filter off all cookies except for plugin-provided ones that are
     # path-specific (i.e path != "/").
-    def remove_unwanted_cookies(cookie_list)
-      return nil if cookie_list.nil?
-      cookie_list.select do |c|
+    def remove_unwanted_cookies(set_cookie)
+      return nil if set_cookie.nil?
+      set_cookie.split(/\s*,\s*/).select do |c|
         c =~ /^_noosfero_plugin_\w+=/ && c =~ /path=\/\w+/
-      end
+      end.join(', ')
     end
  
   end
@@ -61,7 +61,7 @@ module NoosferoHttpCaching
 end
  
 unless Rails.env.development?
-  middleware = Rails.application.config.middleware
+  middleware = Noosfero::Application.config.middleware
   ActionController::Base.send(:include, NoosferoHttpCaching)
-  middleware.use NoosferoHttpCaching::Middleware
+  middleware.insert_before ::ActionDispatch::Cookies, NoosferoHttpCaching::Middleware
 end
...	...	@@ -111,9 +111,7 @@ module Noosfero
111	111	# Make sure the secret is at least 30 characters and all random,
112	112	# no regular words or you'll be exposed to dictionary attacks.
113	113	config.secret_token = noosfero_session_secret
114		- config.action_dispatch.session = {
115		- :key => '_noosfero_session',
116		- }
	114	+ config.session_store :cookie_store, :key => '_noosfero_session'
117	115
118	116	config.time_zone = File.read('/etc/timezone').split("\n").first
119	117	config.active_record.default_timezone = :local
...	...
...	...	@@ -61,6 +61,11 @@ Depends:
61	61	dbconfig-common,
62	62	adduser,
63	63	exim4 \| mail-transport-agent,
	64	+# to minimize upgrade issues:
	65	+ ruby-feedparser (>= 0.7-3~),
	66	+ ruby-eventmachine (>= 0.12.10-4~),
	67	+ ruby-rack (>= 1.4.5-2~),
	68	+ ruby-tzinfo (>= 1.1.0-2~),
64	69	${misc:Depends}
65	70	Recommends:
66	71	postgresql,
...	...
...	...	@@ -10,6 +10,13 @@ sub vcl_recv {
10	10	}
11	11	}
12	12
	13	+sub vcl_deliver {
	14	+ # Force clients to aways hit the server again for HTML pages
	15	+ if (resp.http.Content-Type ~ "^text/html") {
	16	+ set resp.http.Cache-Control = "no-cache";
	17	+ }
	18	+}
	19	+
13	20	sub vcl_error {
14	21	set obj.http.Content-Type = "text/html; charset=utf-8";
15	22
...	...
...	...	@@ -49,11 +49,11 @@ module NoosferoHttpCaching
49	49
50	50	# filter off all cookies except for plugin-provided ones that are
51	51	# path-specific (i.e path != "/").
52		- def remove_unwanted_cookies(cookie_list)
53		- return nil if cookie_list.nil?
54		- cookie_list.select do \|c\|
	52	+ def remove_unwanted_cookies(set_cookie)
	53	+ return nil if set_cookie.nil?
	54	+ set_cookie.split(/\s,\s/).select do \|c\|
55	55	c =~ /^_noosfero_plugin_\w+=/ && c =~ /path=\/\w+/
56		- end
	56	+ end.join(', ')
57	57	end
58	58
59	59	end
...	...	@@ -61,7 +61,7 @@ module NoosferoHttpCaching
61	61	end
62	62
63	63	unless Rails.env.development?
64		- middleware = Rails.application.config.middleware
	64	+ middleware = Noosfero::Application.config.middleware
65	65	ActionController::Base.send(:include, NoosferoHttpCaching)
66		- middleware.use NoosferoHttpCaching::Middleware
	66	+ middleware.insert_before ::ActionDispatch::Cookies, NoosferoHttpCaching::Middleware
67	67	end
...	...