Attachment 158076 Details for Bug 195916 – Consolidate default logs under /var/log/nginx/

[patch] Consolidate default logs under /var/log/nginx/

www_nginx.patch (text/plain), 1.74 KB, created by VK on 2015-06-26 17:21:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: VK

Created: 2015-06-26 17:21:51 UTC

Size: 1.74 KB

patch

obsolete

>Index: www/nginx/Makefile
>===================================================================
>--- www/nginx/Makefile	(revision 390643)
>+++ www/nginx/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	nginx
> PORTVERSION=	1.8.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	2
> CATEGORIES=	www
> MASTER_SITES=	http://nginx.org/download/
>@@ -212,13 +212,13 @@
> .endif
> 
> NGINX_VARDIR?=	/var
>-NGINX_LOGDIR?=	${NGINX_VARDIR}/log
>+NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
> NGINX_RUNDIR?=	${NGINX_VARDIR}/run
> NGINX_TMPDIR?=	${NGINX_VARDIR}/tmp/nginx
> HTTP_PORT?=	80
> 
>-NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/nginx-access.log
>-NGINX_ERRORLOG?=	${NGINX_LOGDIR}/nginx-error.log
>+NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
>+NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
> 
> CONFLICTS?=	nginx-devel-1.*
> USE_RC_SUBR=	nginx
>@@ -871,7 +871,7 @@
> EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
> .endif
> 
>-PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
>+PLIST_SUB+=	NGINX_LOGDIR=${NGINX_LOGDIR} NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
> 
> USERS?=	${WWWOWN}
> GROUPS?=${WWWGRP}
>@@ -987,6 +987,7 @@
> do-install:
> 	${MKDIR} ${STAGEDIR}${ETCDIR}
> 	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
>+	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
> 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
> .for i in koi-utf koi-win win-utf
> 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
>Index: www/nginx/pkg-plist
>===================================================================
>--- www/nginx/pkg-plist	(revision 390643)
>+++ www/nginx/pkg-plist	(working copy)
>@@ -25,4 +25,5 @@
> %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
> sbin/nginx
> @dir %%NGINX_TMPDIR%%
>+@dir %%NGINX_LOGDIR%%
> man/man8/nginx.8.gz

Actions: View | Diff

Attachments on bug 195916: 158076 | 163668 | 170746 | 171499 | 174411