View | Details | Raw Unified | Return to bug 146319
Collapse All | Expand All

(-)/home/admin/joehorn/varnish/Makefile (-3 / +3 lines)
Lines 7-27 Link Here
7
7
8
PORTNAME=	varnish
8
PORTNAME=	varnish
9
PORTVERSION=	2.1.1
9
PORTVERSION=	2.1.1
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	www
11
CATEGORIES=	www
12
MASTER_SITES=	SF
12
MASTER_SITES=	SF
13
13
14
MAINTAINER=	des@FreeBSD.org
14
MAINTAINER=	des@FreeBSD.org
15
COMMENT=	The Varnish high-performance HTTP accelerator
15
COMMENT=	The Varnish high-performance HTTP accelerator
16
16
17
LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
18
17
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
18
USE_GMAKE=	yes
20
USE_GMAKE=	yes
19
CONFIGURE_ARGS=	--localstatedir=${PREFIX}
21
CONFIGURE_ARGS=	--localstatedir=${PREFIX}
20
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
21
USE_GNOME=	pkgconfig
23
USE_GNOME=	pkgconfig
22
24
23
LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
24
25
MAN1=		varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
25
MAN1=		varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
26
		varnishncsa.1 varnishreplay.1 varnishsizes.1 \
26
		varnishncsa.1 varnishreplay.1 varnishsizes.1 \
27
		varnishstat.1 varnishtest.1 varnishtop.1
27
		varnishstat.1 varnishtest.1 varnishtop.1
(-)/home/admin/joehorn/varnish/files/varnishd.in (-4 / +8 lines)
Lines 31-36 Link Here
31
# varnishd_config - name of the varnishd config file.
31
# varnishd_config - name of the varnishd config file.
32
#	default: unset.
32
#	default: unset.
33
#
33
#
34
# varnishd_algo - hash algorithm
35
#       default: "classic,16383"
36
#
34
# varnishd_storage - storage method and parameters.
37
# varnishd_storage - storage method and parameters.
35
#	default: "file,/tmp,50%"
38
#	default: "file,/tmp,50%"
36
#
39
#
Lines 41-48 Link Here
41
#	default: "www"
44
#	default: "www"
42
#
45
#
43
# varnishd_flags - complete command line arguments.
46
# varnishd_flags - complete command line arguments.
44
#	default if varnishd_config is unset: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"
47
#	default if varnishd_config is unset: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_algo} -u ${varnishd_user} -g ${varnishd_group}"
45
#	default if varnishd_config is set: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"
48
#	default if varnishd_config is set: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_algo} -u ${varnishd_user} -g ${varnishd_group}"
46
#
49
#
47
# See varnishd(1) for a detailed overview of command-line options.
50
# See varnishd(1) for a detailed overview of command-line options.
48
#
51
#
Lines 63-74 Link Here
63
: ${varnishd_backend:="localhost:8080"}
66
: ${varnishd_backend:="localhost:8080"}
64
: ${varnishd_config:=""}
67
: ${varnishd_config:=""}
65
: ${varnishd_storage:="file,/tmp,50%"}
68
: ${varnishd_storage:="file,/tmp,50%"}
69
: ${varnishd_algo:="classic,16383"}
66
: ${varnishd_user:="www"}
70
: ${varnishd_user:="www"}
67
: ${varnishd_group:="www"}
71
: ${varnishd_group:="www"}
68
if [ -n "${varnishd_config}" ] ; then
72
if [ -n "${varnishd_config}" ] ; then
69
	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"}
73
	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_algo} -u ${varnishd_user} -g ${varnishd_group}"}
70
else
74
else
71
	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"}
75
	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_algo} -u ${varnishd_user} -g ${varnishd_group}"}
72
fi
76
fi
73
77
74
# If we leave these set, rc.subr will su to them before starting
78
# If we leave these set, rc.subr will su to them before starting

Return to bug 146319