From 7ca2cb50cdcc90a89fc528b950ed7593ac41df90 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 13 Oct 2014 16:36:42 +0200 Subject: [PATCH] nginx: added runit service. --- srcpkgs/nginx/files/nginx/run | 2 ++ srcpkgs/nginx/template | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100755 srcpkgs/nginx/files/nginx/run diff --git a/srcpkgs/nginx/files/nginx/run b/srcpkgs/nginx/files/nginx/run new file mode 100755 index 0000000000..05e9182e4f --- /dev/null +++ b/srcpkgs/nginx/files/nginx/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec nginx -g 'daemon off;' diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index 61e895e577..520e45817d 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -1,7 +1,7 @@ # Template file for 'nginx' pkgname=nginx version=1.6.2 -revision=1 +revision=2 makedepends="pcre-devel>=8.30 libressl-devel" if [ "$CROSS_BUILD" ]; then # fake configure run on host @@ -31,9 +31,7 @@ distfiles="http://nginx.org/download/nginx-$version.tar.gz" checksum=b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18 build_options="systemd" -if [ "$build_option_systemd" ]; then - systemd_services="nginx.service on" -fi +replaces="runit-void<20141013_2" do_configure() { local cfgdir=/etc/nginx @@ -77,7 +75,6 @@ do_configure() { do_build() { make ${makejobs} CC="${CC}" LD="${LD}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } - do_install() { make DESTDIR=$DESTDIR install @@ -90,7 +87,9 @@ do_install() { vmkdir usr/share/nginx mv $DESTDIR/etc/nginx/html/ $DESTDIR/usr/share/nginx - vinstall LICENSE 644 usr/share/licenses/nginx + vlicense LICENSE + vsv nginx + if [ "$build_option_systemd" ]; then vinstall ${FILESDIR}/nginx.service 644 usr/lib/systemd/system fi