Attachment 77306 Details for Bug 111345 – net-mgmt-nagios-181-uid-gid.diff

[patch] net-mgmt-nagios-181-uid-gid.diff

net-mgmt-nagios-181-uid-gid.diff (text/plain), 2.10 KB, created by Jarrod Sayers on 2007-04-07 06:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jarrod Sayers

Created: 2007-04-07 06:10:01 UTC

Size: 2.10 KB

patch

obsolete

>--- ports/net-mgmt/nagios/Makefile.orig	Tue Mar 13 23:57:13 2007
>+++ ports/net-mgmt/nagios/Makefile	Sat Apr  7 14:14:23 2007
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	nagios
> PORTVERSION=	2.8
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	nagios
>@@ -32,6 +33,9 @@
> NAGIOSGROUP?=	nagios
> NAGIOSDIR?=	/var/spool/nagios
> 
>+NAGIOSUID=	181
>+NAGIOSGID=	${NAGIOSUID}
>+
> NAGIOSWWWDIR?=	www/nagios
> NAGIOSHTMURL?=	/nagios
> NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
>@@ -74,6 +78,8 @@
> 		NAGIOSWWWDIR=${NAGIOSWWWDIR} \
> 		NAGIOSUSER=${NAGIOSUSER} \
> 		NAGIOSGROUP=${NAGIOSGROUP} \
>+		NAGIOSUID=${NAGIOSUID} \
>+		NAGIOSGID=${NAGIOSGID} \
> 		NAGIOSHTMURL=${NAGIOSHTMURL} \
> 		NAGIOSCGIURL=${NAGIOSCGIURL} \
> 		WWWGRP=${WWWGRP}
>--- ports/net-mgmt/nagios/files/pkg-install.in.orig	Mon Jan  9 11:24:01 2006
>+++ ports/net-mgmt/nagios/files/pkg-install.in	Sat Apr  7 14:13:03 2007
>@@ -6,6 +6,8 @@
> NAGIOSDIR=%%NAGIOSDIR%%
> NAGIOSUSER=%%NAGIOSUSER%%
> NAGIOSGROUP=%%NAGIOSGROUP%%
>+NAGIOSUID=%%NAGIOSUID%%
>+NAGIOSGID=%%NAGIOSGID%%
> 
> ask() {
>   local question default answer
>@@ -46,7 +48,8 @@
>   else
>     echo "You need a \"${NAGIOSGROUP}\" group."
>     if yesno "Would you like me to create it" "YES"; then
>-      /usr/sbin/pw groupadd "${NAGIOSGROUP}" -h - || exit
>+      /usr/sbin/pw groupadd "${NAGIOSGROUP}" -g "${NAGIOSGID}" -h - || \
>+        /usr/sbin/pw groupadd "${NAGIOSGROUP}" -h - || exit
>       echo "Done."
>     else
>       echo "Please create the \"${NAGIOSGROUP}\" group manually and try again."
>@@ -59,7 +62,9 @@
>   else
>     echo "You need a \"${NAGIOSUSER}\" user."
>     if yesno "Would you like me to create it" "YES"; then
>-      /usr/sbin/pw useradd "${NAGIOSUSER}" -g "${NAGIOSGROUP}" -h - -d "${NAGIOSDIR}" \
>+      /usr/sbin/pw useradd "${NAGIOSUSER}" -u "${NAGIOSUID}" -g "${NAGIOSGROUP}" -h - -d "${NAGIOSDIR}" \
>+        -s /sbin/nologin -c "Nagios pseudo-user" || \
>+        /usr/sbin/pw useradd "${NAGIOSUSER}" -g "${NAGIOSGROUP}" -h - -d "${NAGIOSDIR}" \
>         -s /sbin/nologin -c "Nagios pseudo-user" || exit
>     else
>       echo "Please create the \"${NAGIOSUSER}\" user manually and try again."

Actions: View | Diff

Attachments on bug 111345: 77306