Changeset 51:de2fd68c1aca in minitage/eggs/minitage.paste

Timestamp:

08/12/08 18:48:54 (5 months ago)

Author:

kiorky <kiorky@…>

Message:

0.0.1_alpha34

---

• fix init script
  

0.0.1_alpha33
---------------

• rename varnish binaries
  

Files:

• CHANGES.txt (modified) (1 diff)
• minitage/paste/profils/varnish/template/bin/varnish-instance_tmpl (moved) (moved from minitage/paste/profils/varnish/template/bin/+project+_varnish-instance_tmpl) (1 diff)
• minitage/paste/profils/varnish/template/bin/varnishadm_tmpl (moved) (moved from minitage/paste/profils/varnish/template/bin/+project+_varnishadm_tmpl)
• minitage/paste/profils/varnish/template/bin/varnishd_tmpl (moved) (moved from minitage/paste/profils/varnish/template/bin/+project+_varnishd_tmpl)
• minitage/paste/profils/varnish/template/bin/varnishhist_tmpl (moved) (moved from minitage/paste/profils/varnish/template/bin/+project+_varnishhist_tmpl)
• minitage/paste/profils/varnish/template/bin/varnishlog_tmpl (moved) (moved from minitage/paste/profils/varnish/template/bin/+project+_varnishlog_tmpl)
• minitage/paste/profils/varnish/template/bin/varnishncsa_tmpl (moved) (moved from minitage/paste/profils/varnish/template/bin/+project+_varnishncsa_tmpl)
• minitage/paste/profils/varnish/template/bin/varnishreplay_tmpl (moved) (moved from minitage/paste/profils/varnish/template/bin/+project+_varnishreplay_tmpl)
• minitage/paste/profils/varnish/template/bin/varnishstat_tmpl (moved) (moved from minitage/paste/profils/varnish/template/bin/+project+_varnishstat_tmpl)
• minitage/paste/profils/varnish/template/bin/varnishtop_tmpl (moved) (moved from minitage/paste/profils/varnish/template/bin/+project+_varnishtop_tmpl)
• minitage/paste/profils/varnish/template/etc/init.d/+project+_varnish_tmpl (modified) (1 diff)
• minitage/paste/profils/varnish/template/etc/varnish/+project+.vcl_tmpl (modified) (8 diffs)
• setup.py (modified) (1 diff)

CHANGES.txt

@@ -2 +2 @@
 CHANGES
 ==============
+0.0.1_alpha34
+--------------- 
+ - fix init script
 
-0.0.1_alpha29
+0.0.1_alpha33
 --------------- 
+ - rename varnish binaries
+
+0.0.1_alpha32
+---------------
+    - Improve varnish default vcl
+
+0.0.1_alpha31
+---------------
+ - Improve varnish default vcl
+
+0.0.1_alpha30
+---------------
  - Improve varnish template
-
 
 0.0.1_alpha29

minitage/paste/profils/varnish/template/bin/varnish-instance_tmpl

@@ -2 +2 @@
 source $sys/share/minitage/minitage.env
 export  LD_LIBRARY_PATH=$vp/lib/
-exec $sys/bin/${project}_varnishd \
+exec $sys/bin/varnishd \
     -f "$sys/etc/varnish/${project}.vcl" \
     -P "$sys/var/run/varnish/${project}.pid" \

minitage/paste/profils/varnish/template/etc/init.d/+project+_varnish_tmpl

@@ -30 +30 @@
     fi
     if [[ `whoami` == root ]];then
-        su \$effectiveuser -c "${sys}/bin/${project}_varnish-instance"
+        su \$effectiveuser -c "${sys}/bin/varnish-instance"
     else
-        ${sys}/bin/${project}_varnish-instance
+        ${sys}/bin/varnish-instance
     fi
     eend \$?

minitage/paste/profils/varnish/template/etc/varnish/+project+.vcl_tmpl

@@ -16 +16 @@
 
 sub vcl_recv {
-
     /* Purge stuff */
     if (req.request == "PURGE") {
@@ -23 +22 @@
         }
         lookup;
-    } 
+    }
 
     /*
@@ -34 +33 @@
     #set $host, $port = $host_address.split(':')
     elsif (req.url ~ "^/VirtualHostBase/http/${vhost_vhm}${zope_path}/VirtualHostRoot") {
+        /* uncomment this code to unify vhosts if you need to do */
+        // /* first: unify the host header */
+        // if (req.http.host ~ "^.*example.com") {
+        //     set req.http.host = "example.com";
+        // }
+
+        // /* zope specific: unify vhost_vhm url */
+        // set req.url = regsub(req.url, "^/VirtualHostBase/http/${vhost_vhm}", "/VirtualHostBase/http/example.com:80");
+
         set req.backend = backend_0;
     }
@@ -80 +88 @@
 
     /* handle http compression. */
-    /*
     if (req.http.Accept-Encoding) {
         // Handle compression correctly. Varnish treats headers literally, not
@@ -96 +103 @@
             remove req.http.Accept-Encoding;
         }
-    }*/
+    }
 
     if (req.http.Expect) {
@@ -136 +143 @@
 
 sub vcl_hash {
-    /*
-     * The hash subroutine is important
-     * It defines the "name" pattern of
-     * cache objects
-     * We will use url+host by default.
-     * In this way, different machines may
-     * share the same cache object.
-     */
     set req.hash += req.url;
-    set req.hash += req.http.host;
-
-    /*
-     * You can also append cookie
-     * to the hash. In this way,
-     * varnish will fetch/insert a cache object for each
-     * machine.
-     */
-    if (!(req.url ~ "\.(css|js|png|gif|jpg|jpeg|tiff|doc|odt|pdf|htc)$")) {
-        if (req.http.Cookie && req.http.Cookie ~ "_ZopeId" ) {
-            set req.hash += req.http.Cookie;
-        }
+    if (req.http.host) {
+        set req.hash += req.http.host;
+    } else {
+
+        set req.hash += server.ip;
     }
     hash;
@@ -162 +154 @@
 
 sub vcl_fetch {
+
+
     /*  Do not store errors in cache, as maybe they will be corrected soon :-) */
     if (obj.status == 404 || obj.status == 500) {
@@ -233 +227 @@
     insert;
 }
+\# vim: set ft=c:
 #end if

setup.py

@@ -7 +7 @@
 
 name='minitage.paste'
-version = '0.0.1_alpha29'
+version = '0.0.1_alpha34'
 
 def read(rnames):