From 29f5aa692a3fa3ff3e743a47d1c57f1cc0341809 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 1 Jan 2012 23:14:56 +0000
Subject: Sun Jan  1 23:14:56 UTC 2012

---
 extra/varnish/PKGBUILD        |  6 +++---
 extra/varnish/rc.varnish      | 10 +++++-----
 extra/varnish/varnish.install |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'extra/varnish')

diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 269a1cbcf..506e911be 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145758 2011-12-30 04:10:39Z dreisner $
+# $Id: PKGBUILD 145793 2012-01-01 02:41:17Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Douglas Soares de Andrade
@@ -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 @@ source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
         "rc.$pkgname")
 md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
          'edd1237d097d72173d9772754335890c'
-         'fc9bf7a47479c4ad01c0e555d4e74f91')
+         '8366f51568c0bbb3d3891aa0cc724369')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish
index 4e4fde60d..2841665e5 100644
--- a/extra/varnish/rc.varnish
+++ b/extra/varnish/rc.varnish
@@ -12,7 +12,7 @@ reload_vcl() {
     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 @@ reload_vcl() {
 
   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 @@ if [[ -r $pidfile ]]; then
   fi
 fi
 
-case "$1" in
+case $1 in
   start)
     stat_busy "Starting Varnish Reverse Proxy"
     if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then
diff --git a/extra/varnish/varnish.install b/extra/varnish/varnish.install
index fceaf4be7..1cbb1f16e 100644
--- a/extra/varnish/varnish.install
+++ b/extra/varnish/varnish.install
@@ -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
 }
-- 
cgit v1.2.3-54-g00ecf