From 5692c36470c2f0e102f2953a475b985c0deb7df5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 13 Oct 2014 14:18:08 +0200 Subject: [PATCH] varnish: added runit service. --- srcpkgs/varnish/files/varnishd/run | 2 ++ srcpkgs/varnish/template | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100755 srcpkgs/varnish/files/varnishd/run diff --git a/srcpkgs/varnish/files/varnishd/run b/srcpkgs/varnish/files/varnishd/run new file mode 100755 index 0000000000..8080615090 --- /dev/null +++ b/srcpkgs/varnish/files/varnishd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nogroup -F diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template index f595cfe898..58adf3e36b 100644 --- a/srcpkgs/varnish/template +++ b/srcpkgs/varnish/template @@ -1,14 +1,15 @@ # Template file for 'varnish' pkgname=varnish version=3.0.5 -revision=1 +revision=2 lib32disabled=yes +replaces="runit-void<20141013_2" +build_options="systemd" build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config python" makedepends="pcre-devel readline-devel" conf_files="/etc/varnish/default.vcl" -systemd_services="varnish.service on" make_dirs="/var/varnish 750 nobody nogroup" short_desc="A fast caching HTTP reverse proxy" maintainer="Juan RP " @@ -18,10 +19,13 @@ distfiles="http://repo.varnish-cache.org/source/${pkgname}-${version}.tar.gz" checksum=302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 post_install() { - # systemd reload helper - vinstall ${FILESDIR}/varnish-vcl-reload 755 usr/sbin # systemd service - vinstall ${FILESDIR}/varnish.service 644 usr/lib/systemd/system + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/varnish.service 644 usr/lib/systemd/system + # systemd reload helper + vinstall ${FILESDIR}/varnish-vcl-reload 755 usr/sbin + fi + vsv varnishd } libvarnishapi_package() { @@ -30,7 +34,6 @@ libvarnishapi_package() { vmove "usr/lib/*.so.*" } } - libvarnishapi-devel_package() { depends="libvarnishapi>=${version}_${revision}" short_desc+=" - API development files"