[arch-commits] Commit in varnish/repos (10 files)

Dave Reisner dreisner at archlinux.org
Mon Feb 6 20:02:40 UTC 2012


    Date: Monday, February 6, 2012 @ 15:02:40
  Author: dreisner
Revision: 149324

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  varnish/repos/staging-i686/
  varnish/repos/staging-i686/PKGBUILD
    (from rev 149323, varnish/trunk/PKGBUILD)
  varnish/repos/staging-i686/rc.varnish
    (from rev 149323, varnish/trunk/rc.varnish)
  varnish/repos/staging-i686/varnish.conf.d
    (from rev 149323, varnish/trunk/varnish.conf.d)
  varnish/repos/staging-i686/varnish.install
    (from rev 149323, varnish/trunk/varnish.install)
  varnish/repos/staging-x86_64/
  varnish/repos/staging-x86_64/PKGBUILD
    (from rev 149323, varnish/trunk/PKGBUILD)
  varnish/repos/staging-x86_64/rc.varnish
    (from rev 149323, varnish/trunk/rc.varnish)
  varnish/repos/staging-x86_64/varnish.conf.d
    (from rev 149323, varnish/trunk/varnish.conf.d)
  varnish/repos/staging-x86_64/varnish.install
    (from rev 149323, varnish/trunk/varnish.install)

--------------------------------+
 staging-i686/PKGBUILD          |   45 ++++++++++++++++++++++++
 staging-i686/rc.varnish        |   71 +++++++++++++++++++++++++++++++++++++++
 staging-i686/varnish.conf.d    |   11 ++++++
 staging-i686/varnish.install   |    6 +++
 staging-x86_64/PKGBUILD        |   45 ++++++++++++++++++++++++
 staging-x86_64/rc.varnish      |   71 +++++++++++++++++++++++++++++++++++++++
 staging-x86_64/varnish.conf.d  |   11 ++++++
 staging-x86_64/varnish.install |    6 +++
 8 files changed, 266 insertions(+)

Copied: varnish/repos/staging-i686/PKGBUILD (from rev 149323, varnish/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2012-02-06 20:02:40 UTC (rev 149324)
@@ -0,0 +1,45 @@
+# $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=5
+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")
+md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
+         'edd1237d097d72173d9772754335890c'
+         '8366f51568c0bbb3d3891aa0cc724369')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var/lib
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -D -m755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
+  install -D -m644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: varnish/repos/staging-i686/rc.varnish (from rev 149323, varnish/trunk/rc.varnish)
===================================================================
--- staging-i686/rc.varnish	                        (rev 0)
+++ staging-i686/rc.varnish	2012-02-06 20:02:40 UTC (rev 149324)
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/varnish
+
+reload_vcl() {
+  local activecfg newcfg
+
+  if [[ -z $VARNISH_CFG ]]; then
+    printf '==> ERROR: VARNISH_CFG is undefined in /etc/conf.d/varnish!\n'
+    return 1
+  fi
+
+  activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
+  if [[ -z $activecfg ]]; then
+    printf '==> ERROR: No active VCL found!\n'
+    return 1
+  fi
+
+  printf -v newcfg 'vcl-%(%s)T' -1
+
+  varnishadm "vcl.load $newcfg $VARNISH_CFG" &&
+  varnishadm "vcl.use $newcfg" &&
+  varnishadm "vcl.discard $activecfg" || return 1
+}
+
+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)
+    stat_busy "Recompiling and Reloading VCL"
+    reload_vcl && stat_done || stat_fail
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+  ;;
+esac

Copied: varnish/repos/staging-i686/varnish.conf.d (from rev 149323, varnish/trunk/varnish.conf.d)
===================================================================
--- staging-i686/varnish.conf.d	                        (rev 0)
+++ staging-i686/varnish.conf.d	2012-02-06 20:02:40 UTC (rev 149324)
@@ -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"

Copied: varnish/repos/staging-i686/varnish.install (from rev 149323, varnish/trunk/varnish.install)
===================================================================
--- staging-i686/varnish.install	                        (rev 0)
+++ staging-i686/varnish.install	2012-02-06 20:02:40 UTC (rev 149324)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# remove localstatedir -- compiled VCL and slab files will still be here.
+post_remove() {
+  rm -rf var/lib/varnish
+}

Copied: varnish/repos/staging-x86_64/PKGBUILD (from rev 149323, varnish/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2012-02-06 20:02:40 UTC (rev 149324)
@@ -0,0 +1,45 @@
+# $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=5
+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")
+md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
+         'edd1237d097d72173d9772754335890c'
+         '8366f51568c0bbb3d3891aa0cc724369')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var/lib
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -D -m755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
+  install -D -m644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: varnish/repos/staging-x86_64/rc.varnish (from rev 149323, varnish/trunk/rc.varnish)
===================================================================
--- staging-x86_64/rc.varnish	                        (rev 0)
+++ staging-x86_64/rc.varnish	2012-02-06 20:02:40 UTC (rev 149324)
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/varnish
+
+reload_vcl() {
+  local activecfg newcfg
+
+  if [[ -z $VARNISH_CFG ]]; then
+    printf '==> ERROR: VARNISH_CFG is undefined in /etc/conf.d/varnish!\n'
+    return 1
+  fi
+
+  activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
+  if [[ -z $activecfg ]]; then
+    printf '==> ERROR: No active VCL found!\n'
+    return 1
+  fi
+
+  printf -v newcfg 'vcl-%(%s)T' -1
+
+  varnishadm "vcl.load $newcfg $VARNISH_CFG" &&
+  varnishadm "vcl.use $newcfg" &&
+  varnishadm "vcl.discard $activecfg" || return 1
+}
+
+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)
+    stat_busy "Recompiling and Reloading VCL"
+    reload_vcl && stat_done || stat_fail
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+  ;;
+esac

Copied: varnish/repos/staging-x86_64/varnish.conf.d (from rev 149323, varnish/trunk/varnish.conf.d)
===================================================================
--- staging-x86_64/varnish.conf.d	                        (rev 0)
+++ staging-x86_64/varnish.conf.d	2012-02-06 20:02:40 UTC (rev 149324)
@@ -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"

Copied: varnish/repos/staging-x86_64/varnish.install (from rev 149323, varnish/trunk/varnish.install)
===================================================================
--- staging-x86_64/varnish.install	                        (rev 0)
+++ staging-x86_64/varnish.install	2012-02-06 20:02:40 UTC (rev 149324)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# remove localstatedir -- compiled VCL and slab files will still be here.
+post_remove() {
+  rm -rf var/lib/varnish
+}




More information about the arch-commits mailing list