Merge commit 'refs/merge-requests/206' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/206

Merge commit 'refs/merge-requests/206' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/206
Antonio Terceiro
2 parents d88dcc33 8d7dd8c8
Showing 4 changed files with 21 additions and 8 deletions Show diff stats
INSTALL.varnish
debian/control
etc/noosfero/varnish-noosfero.vcl
test/integration/varnish_conf_test.rb
@@ -15,6 +15,10 @@ Noosfero was tested with Varnish 2.x. If you are using a Debian Lenny (and you
 should, unless Debian already released Squeeze by now), make sure you install
 varnish from the lenny-backports suite.
  
+Install the RPAF apache module (or skip this step if not using apache):
+
+  # apt-get install libapache2-mod-rpaf
+
 3) Enable varnish logging:
  
 3a) Edit /etc/default/varnishncsa and uncomment the line that contains:
@@ -61,8 +61,7 @@ Description: free web-based platform for social networks
  
 Package: noosfero-apache
 Architecture: all
-Depends: apache2, debconf
-Suggests: noosfero
+Depends: apache2, debconf, noosfero
 Description: free web-based platform for social networks (apache frontend)
  Noosfero is a web platform for social and solidarity economy networks with
  blog, e-Porfolios, CMS, RSS, thematic discussion, events agenda and collective
 sub vcl_recv {
+  if (req.request == "GET" || req.request == "HEAD") {
     if (req.http.Cookie) {
-        # We only care about the "_noosfero_session.*" cookie, used for
-        # authentication.
-        if (req.http.Cookie ~ "_noosfero_session.*" ) {
-             return (pass);
-        }
-        # Else strip all cookies
+      # We only care about the "_noosfero_session.*" cookie, used for
+      # authentication.
+      if (req.http.Cookie !~ "_noosfero_session.*" ) {
+        # strip all cookies
         unset req.http.Cookie;
+      }
     }
+  }
 }
  
 sub vcl_error {
@@ -0,0 +1,9 @@
+require 'test/unit'
+
+class VarnishConfTest < Test::Unit::TestCase
+
+   def test_not_use_return_in_varnish_noosfero
+    assert !system('grep "return.*pass" etc/noosfero/varnish-noosfero.vcl')
+  end
+
+end
...	...	@@ -15,6 +15,10 @@ Noosfero was tested with Varnish 2.x. If you are using a Debian Lenny (and you
15	15	should, unless Debian already released Squeeze by now), make sure you install
16	16	varnish from the lenny-backports suite.
17	17
	18	+Install the RPAF apache module (or skip this step if not using apache):
	19	+
	20	+ # apt-get install libapache2-mod-rpaf
	21	+
18	22	3) Enable varnish logging:
19	23
20	24	3a) Edit /etc/default/varnishncsa and uncomment the line that contains:
...	...
...	...	@@ -61,8 +61,7 @@ Description: free web-based platform for social networks
61	61
62	62	Package: noosfero-apache
63	63	Architecture: all
64		-Depends: apache2, debconf
65		-Suggests: noosfero
	64	+Depends: apache2, debconf, noosfero
66	65	Description: free web-based platform for social networks (apache frontend)
67	66	Noosfero is a web platform for social and solidarity economy networks with
68	67	blog, e-Porfolios, CMS, RSS, thematic discussion, events agenda and collective
...	...
1	1	sub vcl_recv {
	2	+ if (req.request == "GET" \|\| req.request == "HEAD") {
2	3	if (req.http.Cookie) {
3		- # We only care about the "_noosfero_session.*" cookie, used for
4		- # authentication.
5		- if (req.http.Cookie ~ "_noosfero_session.*" ) {
6		- return (pass);
7		- }
8		- # Else strip all cookies
	4	+ # We only care about the "_noosfero_session.*" cookie, used for
	5	+ # authentication.
	6	+ if (req.http.Cookie !~ "_noosfero_session.*" ) {
	7	+ # strip all cookies
9	8	unset req.http.Cookie;
	9	+ }
10	10	}
	11	+ }
11	12	}
12	13
13	14	sub vcl_error {
...	...
...	...	@@ -0,0 +1,9 @@
	1	+require 'test/unit'
	2	+
	3	+class VarnishConfTest < Test::Unit::TestCase
	4	+
	5	+ def test_not_use_return_in_varnish_noosfero
	6	+ assert !system('grep "return.*pass" etc/noosfero/varnish-noosfero.vcl')
	7	+ end
	8	+
	9	+end
...	...