[arch-commits] Commit in varnish/trunk (PKGBUILD rc.varnish varnish.install)

[Dave Reisner]

    Date: Saturday, December 31, 2011 @ 21:40:59
  Author: dreisner
Revision: 145792

upgpkg: varnish 3.0.2-4

let varnish figure out which instance to connect to for reload

Modified:
  varnish/trunk/PKGBUILD
  varnish/trunk/rc.varnish
  varnish/trunk/varnish.install

-----------------+
 PKGBUILD        |    4 ++--
 rc.varnish      |   10 +++++-----
 varnish.install |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-01 01:38:19 UTC (rev 145791)
+++ PKGBUILD	2012-01-01 02:40:59 UTC (rev 145792)
@@ -6,7 +6,7 @@
 
 pkgname=varnish
 pkgver=3.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="High-performance HTTP accelerator"
 arch=('i686' 'x86_64')
 url="http://www.varnish-cache.org/"
@@ -21,7 +21,7 @@
         "rc.$pkgname")
 md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
          'edd1237d097d72173d9772754335890c'
-         'fc9bf7a47479c4ad01c0e555d4e74f91')
+         '8366f51568c0bbb3d3891aa0cc724369')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"

Modified: rc.varnish
===================================================================
--- rc.varnish	2012-01-01 01:38:19 UTC (rev 145791)
+++ rc.varnish	2012-01-01 02:40:59 UTC (rev 145792)
@@ -12,7 +12,7 @@
     return 1
   fi
 
-  activecfg=$(varnishadm -T localhost:6082 "vcl.list" | awk '/active/{ print $3 }')
+  activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
   if [[ -z $activecfg ]]; then
     printf '==> ERROR: No active VCL found!\n'
     return 1
@@ -20,9 +20,9 @@
 
   printf -v newcfg 'vcl-%(%s)T' -1
 
-  varnishadm -T localhost:6082 "vcl.load $newcfg $VARNISH_CFG" &&
-  varnishadm -T localhost:6082 "vcl.use $newcfg" &&
-  varnishadm -T localhost:6082 "vcl.discard $activecfg" || return 1
+  varnishadm "vcl.load $newcfg $VARNISH_CFG" &&
+  varnishadm "vcl.use $newcfg" &&
+  varnishadm "vcl.discard $activecfg" || return 1
 }
 
 pidfile=/run/varnish.pid
@@ -35,7 +35,7 @@
   fi
 fi
 
-case "$1" in
+case $1 in
   start)
     stat_busy "Starting Varnish Reverse Proxy"
     if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then

Modified: varnish.install
===================================================================
--- varnish.install	2012-01-01 01:38:19 UTC (rev 145791)
+++ varnish.install	2012-01-01 02:40:59 UTC (rev 145792)
@@ -2,5 +2,5 @@
 
 # remove localstatedir -- compiled VCL and slab files will still be here.
 post_remove() {
-  rm -rf /var/lib/varnish
+  rm -rf var/lib/varnish
 }