[PATCH] Enable icon caching for pkgdb

Mike McGrath mmcgrath at redhat.com
Wed Sep 15 15:13:17 UTC 2010


Toshio and I worked through this yesterday and agreed the change was worth
it.  It's very easy to revert.  Can I get 2 +1's?

diff --git a/manifests/servergroups/proxy.pp
b/manifests/servergroups/proxy.pp
index 43e0c69..099305c 100644
--- a/manifests/servergroups/proxy.pp
+++ b/manifests/servergroups/proxy.pp
@@ -401,7 +401,7 @@ class proxy {
     fedora-packagedb::proxy { "admin.fedoraproject.org/pkgdb":
         website  => "admin.fedoraproject.org",
         path     => "/pkgdb",
-        proxyurl => "http://localhost:10003",
+        proxyurl => "http://localhost:6081",
     }

     bodhi::proxy { "admin.fedoraproject.org/updates":
diff --git a/modules/varnish/files/proxy.vcl
b/modules/varnish/files/proxy.vcl
index 2ba7414..327e1be 100644
--- a/modules/varnish/files/proxy.vcl
+++ b/modules/varnish/files/proxy.vcl
@@ -112,8 +112,9 @@ sub vcl_recv {
     if (req.url ~ "^/w/") {
         set req.backend = wiki;
     }
-    if (req.url ~ "^/pkgdb/") {
+    if (req.url ~ "^/pkgdb/appicon/show/") {
         set req.backend = pkgdb;
+        unset req.http.cookie;
     }
     if (req.url ~ "^/mirrorlist/") {
         set req.backend = mirrorlists;
@@ -187,6 +188,13 @@ sub vcl_recv {
     lookup;
 }

+# When requesting application icons, don't allow cherrypy to set cookies
+sub vcl_fetch {
+    if (req.url ~ "^/pkgdb/appicon/show/") {
+        unset obj.http.set-cookie;
+    }
+}
+
 # Called if the cache has a copy of the page.
 #sub vcl_hit {
 #    if (req.request == "PURGE")




More information about the infrastructure mailing list