diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-24 12:49:28 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-24 12:49:28 -0300 |
commit | 0c5c6934b681707ec1a459da4318aabd7f9b796f (patch) | |
tree | 7ad632e8f99be5f959a9208726944302eb702e76 /extra/varnish | |
parent | 1e612047394eb4eee29357e7ab156db60b88f783 (diff) | |
parent | 12b846e1ead204137d60caba25f7e494b51b4dc8 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/linux-tools/PKGBUILD
community/powertop/PKGBUILD
Diffstat (limited to 'extra/varnish')
-rw-r--r-- | extra/varnish/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/varnish/varnish.conf.d | 6 | ||||
-rw-r--r-- | extra/varnish/varnish.service | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index c88ccba87..1c4c944fb 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165515 2012-08-21 21:58:47Z dreisner $ +# $Id: PKGBUILD 165520 2012-08-22 17:11:02Z 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.3 -pkgrel=1 +pkgrel=2 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64' 'mips64el') url="http://www.varnish-cache.org/" @@ -22,10 +22,10 @@ source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" varnish-vcl-reload varnish.service) md5sums=('714310c83fdbd2061d897dacd3f63d8b' - 'edd1237d097d72173d9772754335890c' + '3b563d2d9bd74a819fdb116d69d022f0' '40b4c83b3ad225ed2f4bd7e677fe41a2' '03196dee7fc68e75069393d52c370762' - '45cc1fd57aa2ffc22d6af62f9eedc842') + '1adf5282d111a9e00e99786045451016') build() { cd "$pkgname-$pkgver" diff --git a/extra/varnish/varnish.conf.d b/extra/varnish/varnish.conf.d index 904ca119f..4cf40c4fc 100644 --- a/extra/varnish/varnish.conf.d +++ b/extra/varnish/varnish.conf.d @@ -2,10 +2,10 @@ # Command line options to varnishd # +VARNISH_CFG="/etc/varnish/default.vcl" + VARNISHD_OPTS="-a 0.0.0.0:80 \ - -b localhost:8080 \ + -f $VARNISH_CFG \ -T localhost:6082 \ -s malloc,64M -u nobody -g nobody" - -VARNISH_CFG="/etc/varnish/default.vcl" diff --git a/extra/varnish/varnish.service b/extra/varnish/varnish.service index c8bb6c6e1..d5b0aa66d 100644 --- a/extra/varnish/varnish.service +++ b/extra/varnish/varnish.service @@ -3,7 +3,7 @@ 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 +ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F ExecReload=/usr/bin/varnish-vcl-reload [Install] |