[arch-commits] Commit in varnish/repos (24 files)
Dave Reisner
dreisner at archlinux.org
Tue Aug 21 21:58:47 UTC 2012
Date: Tuesday, August 21, 2012 @ 17:58:47
Author: dreisner
Revision: 165515
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
varnish/repos/extra-i686/PKGBUILD
(from rev 165514, varnish/trunk/PKGBUILD)
varnish/repos/extra-i686/rc.varnish
(from rev 165514, varnish/trunk/rc.varnish)
varnish/repos/extra-i686/varnish-vcl-reload
(from rev 165514, varnish/trunk/varnish-vcl-reload)
varnish/repos/extra-i686/varnish.conf.d
(from rev 165514, varnish/trunk/varnish.conf.d)
varnish/repos/extra-i686/varnish.install
(from rev 165514, varnish/trunk/varnish.install)
varnish/repos/extra-i686/varnish.service
(from rev 165514, varnish/trunk/varnish.service)
varnish/repos/extra-x86_64/PKGBUILD
(from rev 165514, varnish/trunk/PKGBUILD)
varnish/repos/extra-x86_64/rc.varnish
(from rev 165514, varnish/trunk/rc.varnish)
varnish/repos/extra-x86_64/varnish-vcl-reload
(from rev 165514, varnish/trunk/varnish-vcl-reload)
varnish/repos/extra-x86_64/varnish.conf.d
(from rev 165514, varnish/trunk/varnish.conf.d)
varnish/repos/extra-x86_64/varnish.install
(from rev 165514, varnish/trunk/varnish.install)
varnish/repos/extra-x86_64/varnish.service
(from rev 165514, varnish/trunk/varnish.service)
Deleted:
varnish/repos/extra-i686/PKGBUILD
varnish/repos/extra-i686/rc.varnish
varnish/repos/extra-i686/varnish-vcl-reload
varnish/repos/extra-i686/varnish.conf.d
varnish/repos/extra-i686/varnish.install
varnish/repos/extra-i686/varnish.service
varnish/repos/extra-x86_64/PKGBUILD
varnish/repos/extra-x86_64/rc.varnish
varnish/repos/extra-x86_64/varnish-vcl-reload
varnish/repos/extra-x86_64/varnish.conf.d
varnish/repos/extra-x86_64/varnish.install
varnish/repos/extra-x86_64/varnish.service
---------------------------------+
extra-i686/PKGBUILD | 115 +++++++++++++++++++-------------------
extra-i686/rc.varnish | 98 ++++++++++++++++----------------
extra-i686/varnish-vcl-reload | 41 ++++++-------
extra-i686/varnish.conf.d | 22 +++----
extra-i686/varnish.install | 12 +--
extra-i686/varnish.service | 20 +++---
extra-x86_64/PKGBUILD | 115 +++++++++++++++++++-------------------
extra-x86_64/rc.varnish | 98 ++++++++++++++++----------------
extra-x86_64/varnish-vcl-reload | 41 ++++++-------
extra-x86_64/varnish.conf.d | 22 +++----
extra-x86_64/varnish.install | 12 +--
extra-x86_64/varnish.service | 20 +++---
12 files changed, 310 insertions(+), 306 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-i686/PKGBUILD 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Douglas Soares de Andrade
-# Contributor: Roberto Alsina <ralsina at kde.org>
-
-pkgname=varnish
-pkgver=3.0.2
-pkgrel=6
-pkgdesc="High-performance HTTP accelerator"
-arch=('i686' 'x86_64')
-url="http://www.varnish-cache.org/"
-license=('BSD')
-depends=('gcc' 'libedit' 'pcre')
-backup=('etc/conf.d/varnish'
- 'etc/varnish/default.vcl')
-install=$pkgname.install
-options=('!libtool')
-source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
- "$pkgname.conf.d"
- "rc.$pkgname"
- varnish-vcl-reload
- varnish.service)
-md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
- 'edd1237d097d72173d9772754335890c'
- '40b4c83b3ad225ed2f4bd7e677fe41a2'
- '56be884f43b8b4c900a073d9282f124a'
- '45cc1fd57aa2ffc22d6af62f9eedc842')
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var/lib
-
- make
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
- # reload helper
- install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
-
- # sysvinit
- install -Dm755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
- install -Dm644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
-
- # systemd
- install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-
- # license
- install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
Copied: varnish/repos/extra-i686/PKGBUILD (from rev 165514, varnish/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Douglas Soares de Andrade
+# Contributor: Roberto Alsina <ralsina at kde.org>
+
+pkgname=varnish
+pkgver=3.0.3
+pkgrel=1
+pkgdesc="High-performance HTTP accelerator"
+arch=('i686' 'x86_64')
+url="http://www.varnish-cache.org/"
+license=('BSD')
+depends=('gcc' 'libedit' 'pcre')
+backup=('etc/conf.d/varnish'
+ 'etc/varnish/default.vcl')
+install=$pkgname.install
+options=('!libtool')
+source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
+ "$pkgname.conf.d"
+ "rc.$pkgname"
+ varnish-vcl-reload
+ varnish.service)
+md5sums=('714310c83fdbd2061d897dacd3f63d8b'
+ 'edd1237d097d72173d9772754335890c'
+ '40b4c83b3ad225ed2f4bd7e677fe41a2'
+ '03196dee7fc68e75069393d52c370762'
+ '45cc1fd57aa2ffc22d6af62f9eedc842')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # disable JIT compilation for now, as it's crashy on VCL reload
+ sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var/lib
+
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+ # reload helper
+ install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
+
+ # sysvinit
+ install -Dm755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
+ install -Dm644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
+
+ # systemd
+ install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+
+ # license
+ install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
Deleted: extra-i686/rc.varnish
===================================================================
--- extra-i686/rc.varnish 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-i686/rc.varnish 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/varnish
-
-pidfile=/run/varnish.pid
-if [[ -r $pidfile ]]; then
- read -r PID < "$pidfile"
- if [[ ! -d /proc/$PID ]]; then
- # stale pidfile
- unset PID
- rm -f "$pidfile"
- fi
-fi
-
-case $1 in
- start)
- stat_busy "Starting Varnish Reverse Proxy"
- if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then
- add_daemon varnish
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- stop)
- stat_busy "Stopping Varnish Reverse Proxy"
- if [[ $PID ]] && kill $PID &>/dev/null; then
- rm_daemon varnish
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- reload)
- status "Recompiling and Reloading VCL" varnish-vcl-reload $VARNISH_CFG
- ;;
- *)
- echo "usage: $0 {start|stop|restart|reload}"
- ;;
-esac
Copied: varnish/repos/extra-i686/rc.varnish (from rev 165514, varnish/trunk/rc.varnish)
===================================================================
--- extra-i686/rc.varnish (rev 0)
+++ extra-i686/rc.varnish 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/varnish
+
+pidfile=/run/varnish.pid
+if [[ -r $pidfile ]]; then
+ read -r PID < "$pidfile"
+ if [[ ! -d /proc/$PID ]]; then
+ # stale pidfile
+ unset PID
+ rm -f "$pidfile"
+ fi
+fi
+
+case $1 in
+ start)
+ stat_busy "Starting Varnish Reverse Proxy"
+ if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then
+ add_daemon varnish
+ stat_done
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Varnish Reverse Proxy"
+ if [[ $PID ]] && kill $PID &>/dev/null; then
+ rm_daemon varnish
+ stat_done
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ reload)
+ status "Recompiling and Reloading VCL" varnish-vcl-reload $VARNISH_CFG
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|reload}"
+ ;;
+esac
Deleted: extra-i686/varnish-vcl-reload
===================================================================
--- extra-i686/varnish-vcl-reload 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-i686/varnish-vcl-reload 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-cfg=${1:-/etc/varnish/default.vcl}
-
-if [ ! -e "$cfg" ]; then
- printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2
- exit 1
-fi
-
-activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
-if [ -z "$activecfg" ]; then
- printf 'ERROR: No active VCL found!\n' >&2
- exit 1
-fi
-
-newcfg=$(date +'vcl-%s')
-printf 'INFO: using new config %s\n' "$cfg"
-
-varnishadm "vcl.load $newcfg $cfg" &&
-varnishadm "vcl.use $newcfg" &&
-varnishadm "vcl.discard $activecfg"
Copied: varnish/repos/extra-i686/varnish-vcl-reload (from rev 165514, varnish/trunk/varnish-vcl-reload)
===================================================================
--- extra-i686/varnish-vcl-reload (rev 0)
+++ extra-i686/varnish-vcl-reload 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+cfg=${1:-/etc/varnish/default.vcl}
+if [ ! -e "$cfg" ]; then
+ printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2
+ exit 1
+fi
+
+activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
+if [ -z "$activecfg" ]; then
+ printf 'ERROR: No active VCL found!\n' >&2
+ exit 1
+fi
+
+newcfg=$(date +'vcl-%s')
+printf 'INFO: using new config %s\n' "$cfg"
+
+varnishadm "vcl.load $newcfg $cfg" &&
+varnishadm "vcl.use $newcfg" &&
+varnishadm "vcl.discard $activecfg"
Deleted: extra-i686/varnish.conf.d
===================================================================
--- extra-i686/varnish.conf.d 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-i686/varnish.conf.d 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,11 +0,0 @@
-#
-# Command line options to varnishd
-#
-
-VARNISHD_OPTS="-a 0.0.0.0:80 \
- -b localhost:8080 \
- -T localhost:6082 \
- -s malloc,64M
- -u nobody -g nobody"
-
-VARNISH_CFG="/etc/varnish/default.vcl"
Copied: varnish/repos/extra-i686/varnish.conf.d (from rev 165514, varnish/trunk/varnish.conf.d)
===================================================================
--- extra-i686/varnish.conf.d (rev 0)
+++ extra-i686/varnish.conf.d 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,11 @@
+#
+# Command line options to varnishd
+#
+
+VARNISHD_OPTS="-a 0.0.0.0:80 \
+ -b localhost:8080 \
+ -T localhost:6082 \
+ -s malloc,64M
+ -u nobody -g nobody"
+
+VARNISH_CFG="/etc/varnish/default.vcl"
Deleted: extra-i686/varnish.install
===================================================================
--- extra-i686/varnish.install 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-i686/varnish.install 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# remove localstatedir -- compiled VCL and slab files will still be here.
-post_remove() {
- rm -rf var/lib/varnish
-}
Copied: varnish/repos/extra-i686/varnish.install (from rev 165514, varnish/trunk/varnish.install)
===================================================================
--- extra-i686/varnish.install (rev 0)
+++ extra-i686/varnish.install 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# remove localstatedir -- compiled VCL and slab files will still be here.
+post_remove() {
+ rm -rf var/lib/varnish
+}
Deleted: extra-i686/varnish.service
===================================================================
--- extra-i686/varnish.service 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-i686/varnish.service 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Web Application Accelerator
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -b localhost:8080 -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
-ExecReload=/usr/bin/varnish-vcl-reload
-
-[Install]
-WantedBy=multi-user.target
Copied: varnish/repos/extra-i686/varnish.service (from rev 165514, varnish/trunk/varnish.service)
===================================================================
--- extra-i686/varnish.service (rev 0)
+++ extra-i686/varnish.service 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Web Application Accelerator
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -b localhost:8080 -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
+ExecReload=/usr/bin/varnish-vcl-reload
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-x86_64/PKGBUILD 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Douglas Soares de Andrade
-# Contributor: Roberto Alsina <ralsina at kde.org>
-
-pkgname=varnish
-pkgver=3.0.2
-pkgrel=6
-pkgdesc="High-performance HTTP accelerator"
-arch=('i686' 'x86_64')
-url="http://www.varnish-cache.org/"
-license=('BSD')
-depends=('gcc' 'libedit' 'pcre')
-backup=('etc/conf.d/varnish'
- 'etc/varnish/default.vcl')
-install=$pkgname.install
-options=('!libtool')
-source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
- "$pkgname.conf.d"
- "rc.$pkgname"
- varnish-vcl-reload
- varnish.service)
-md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
- 'edd1237d097d72173d9772754335890c'
- '40b4c83b3ad225ed2f4bd7e677fe41a2'
- '56be884f43b8b4c900a073d9282f124a'
- '45cc1fd57aa2ffc22d6af62f9eedc842')
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var/lib
-
- make
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
- # reload helper
- install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
-
- # sysvinit
- install -Dm755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
- install -Dm644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
-
- # systemd
- install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-
- # license
- install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
Copied: varnish/repos/extra-x86_64/PKGBUILD (from rev 165514, varnish/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Douglas Soares de Andrade
+# Contributor: Roberto Alsina <ralsina at kde.org>
+
+pkgname=varnish
+pkgver=3.0.3
+pkgrel=1
+pkgdesc="High-performance HTTP accelerator"
+arch=('i686' 'x86_64')
+url="http://www.varnish-cache.org/"
+license=('BSD')
+depends=('gcc' 'libedit' 'pcre')
+backup=('etc/conf.d/varnish'
+ 'etc/varnish/default.vcl')
+install=$pkgname.install
+options=('!libtool')
+source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
+ "$pkgname.conf.d"
+ "rc.$pkgname"
+ varnish-vcl-reload
+ varnish.service)
+md5sums=('714310c83fdbd2061d897dacd3f63d8b'
+ 'edd1237d097d72173d9772754335890c'
+ '40b4c83b3ad225ed2f4bd7e677fe41a2'
+ '03196dee7fc68e75069393d52c370762'
+ '45cc1fd57aa2ffc22d6af62f9eedc842')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # disable JIT compilation for now, as it's crashy on VCL reload
+ sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var/lib
+
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+ # reload helper
+ install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
+
+ # sysvinit
+ install -Dm755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
+ install -Dm644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
+
+ # systemd
+ install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+
+ # license
+ install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
Deleted: extra-x86_64/rc.varnish
===================================================================
--- extra-x86_64/rc.varnish 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-x86_64/rc.varnish 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/varnish
-
-pidfile=/run/varnish.pid
-if [[ -r $pidfile ]]; then
- read -r PID < "$pidfile"
- if [[ ! -d /proc/$PID ]]; then
- # stale pidfile
- unset PID
- rm -f "$pidfile"
- fi
-fi
-
-case $1 in
- start)
- stat_busy "Starting Varnish Reverse Proxy"
- if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then
- add_daemon varnish
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- stop)
- stat_busy "Stopping Varnish Reverse Proxy"
- if [[ $PID ]] && kill $PID &>/dev/null; then
- rm_daemon varnish
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- reload)
- status "Recompiling and Reloading VCL" varnish-vcl-reload $VARNISH_CFG
- ;;
- *)
- echo "usage: $0 {start|stop|restart|reload}"
- ;;
-esac
Copied: varnish/repos/extra-x86_64/rc.varnish (from rev 165514, varnish/trunk/rc.varnish)
===================================================================
--- extra-x86_64/rc.varnish (rev 0)
+++ extra-x86_64/rc.varnish 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/varnish
+
+pidfile=/run/varnish.pid
+if [[ -r $pidfile ]]; then
+ read -r PID < "$pidfile"
+ if [[ ! -d /proc/$PID ]]; then
+ # stale pidfile
+ unset PID
+ rm -f "$pidfile"
+ fi
+fi
+
+case $1 in
+ start)
+ stat_busy "Starting Varnish Reverse Proxy"
+ if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then
+ add_daemon varnish
+ stat_done
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Varnish Reverse Proxy"
+ if [[ $PID ]] && kill $PID &>/dev/null; then
+ rm_daemon varnish
+ stat_done
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ reload)
+ status "Recompiling and Reloading VCL" varnish-vcl-reload $VARNISH_CFG
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|reload}"
+ ;;
+esac
Deleted: extra-x86_64/varnish-vcl-reload
===================================================================
--- extra-x86_64/varnish-vcl-reload 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-x86_64/varnish-vcl-reload 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-cfg=${1:-/etc/varnish/default.vcl}
-
-if [ ! -e "$cfg" ]; then
- printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2
- exit 1
-fi
-
-activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
-if [ -z "$activecfg" ]; then
- printf 'ERROR: No active VCL found!\n' >&2
- exit 1
-fi
-
-newcfg=$(date +'vcl-%s')
-printf 'INFO: using new config %s\n' "$cfg"
-
-varnishadm "vcl.load $newcfg $cfg" &&
-varnishadm "vcl.use $newcfg" &&
-varnishadm "vcl.discard $activecfg"
Copied: varnish/repos/extra-x86_64/varnish-vcl-reload (from rev 165514, varnish/trunk/varnish-vcl-reload)
===================================================================
--- extra-x86_64/varnish-vcl-reload (rev 0)
+++ extra-x86_64/varnish-vcl-reload 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+cfg=${1:-/etc/varnish/default.vcl}
+if [ ! -e "$cfg" ]; then
+ printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2
+ exit 1
+fi
+
+activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
+if [ -z "$activecfg" ]; then
+ printf 'ERROR: No active VCL found!\n' >&2
+ exit 1
+fi
+
+newcfg=$(date +'vcl-%s')
+printf 'INFO: using new config %s\n' "$cfg"
+
+varnishadm "vcl.load $newcfg $cfg" &&
+varnishadm "vcl.use $newcfg" &&
+varnishadm "vcl.discard $activecfg"
Deleted: extra-x86_64/varnish.conf.d
===================================================================
--- extra-x86_64/varnish.conf.d 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-x86_64/varnish.conf.d 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,11 +0,0 @@
-#
-# Command line options to varnishd
-#
-
-VARNISHD_OPTS="-a 0.0.0.0:80 \
- -b localhost:8080 \
- -T localhost:6082 \
- -s malloc,64M
- -u nobody -g nobody"
-
-VARNISH_CFG="/etc/varnish/default.vcl"
Copied: varnish/repos/extra-x86_64/varnish.conf.d (from rev 165514, varnish/trunk/varnish.conf.d)
===================================================================
--- extra-x86_64/varnish.conf.d (rev 0)
+++ extra-x86_64/varnish.conf.d 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,11 @@
+#
+# Command line options to varnishd
+#
+
+VARNISHD_OPTS="-a 0.0.0.0:80 \
+ -b localhost:8080 \
+ -T localhost:6082 \
+ -s malloc,64M
+ -u nobody -g nobody"
+
+VARNISH_CFG="/etc/varnish/default.vcl"
Deleted: extra-x86_64/varnish.install
===================================================================
--- extra-x86_64/varnish.install 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-x86_64/varnish.install 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# remove localstatedir -- compiled VCL and slab files will still be here.
-post_remove() {
- rm -rf var/lib/varnish
-}
Copied: varnish/repos/extra-x86_64/varnish.install (from rev 165514, varnish/trunk/varnish.install)
===================================================================
--- extra-x86_64/varnish.install (rev 0)
+++ extra-x86_64/varnish.install 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# remove localstatedir -- compiled VCL and slab files will still be here.
+post_remove() {
+ rm -rf var/lib/varnish
+}
Deleted: extra-x86_64/varnish.service
===================================================================
--- extra-x86_64/varnish.service 2012-08-21 21:58:26 UTC (rev 165514)
+++ extra-x86_64/varnish.service 2012-08-21 21:58:47 UTC (rev 165515)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Web Application Accelerator
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -b localhost:8080 -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
-ExecReload=/usr/bin/varnish-vcl-reload
-
-[Install]
-WantedBy=multi-user.target
Copied: varnish/repos/extra-x86_64/varnish.service (from rev 165514, varnish/trunk/varnish.service)
===================================================================
--- extra-x86_64/varnish.service (rev 0)
+++ extra-x86_64/varnish.service 2012-08-21 21:58:47 UTC (rev 165515)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Web Application Accelerator
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -b localhost:8080 -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
+ExecReload=/usr/bin/varnish-vcl-reload
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list