Attachment 156131 Details for Bug 199798 – Option to install Munin plugin

[patch] Option to install Munin plugin

nsd-munin.patch (text/plain), 2.86 KB, created by TEUBEL György on 2015-04-30 06:59:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TEUBEL György

Created: 2015-04-30 06:59:44 UTC

Size: 2.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 384983)
>+++ Makefile	(working copy)
>@@ -26,7 +26,7 @@
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} \
> 		--with-user=${NSDUSER} \
>-		--with-configdir=${PREFIX}/etc/nsd \
>+		--with-configdir=${ETCDIR} \
> 		--localstatedir=${NSDLSDIR} \
> 		--with-dbfile=${NSDDBDIR}/nsd.db \
> 		--with-pidfile=${NSDRUNDIR}/nsd.pid
>@@ -47,8 +47,9 @@
> 		differences.tex
> 
> OPTIONS_DEFINE=		ROOT_SERVER LARGEFILE IPV6 BIND8_STATS CHECKING \
>-		MINRESPSIZE NSEC3 MMAP MAXIPS DOCS RRL ZONE_STATS
>+		MINRESPSIZE NSEC3 MMAP MAXIPS DOCS RRL ZONE_STATS MUNIN_PLUGIN
> OPTIONS_DEFAULT=	LARGEFILE IPV6 NSEC3 MINRESPSIZE RRL
>+OPTIONS_SUB=	yes
> 
> ROOT_SERVER_DESC=	Configure as a root server
> LARGEFILE_DESC=		Largefile support
>@@ -60,6 +61,7 @@
> MAXIPS_DESC=		Raise max-ips from 8 to ${NSDMAX_IPS}
> RRL_DESC=		Response Rate Limiting
> ZONE_STATS_DESC=	Separate statistics for each zone
>+MUNIN_PLUGIN_DESC=	Install Munin Plugin (requires BIND8_STATS)
> 
> LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
> 
>@@ -75,6 +77,18 @@
> RRL_CONFIGURE_ENABLE=		ratelimit
> ZONE_STATS_CONFIGURE_ENABLE=	zone-stats
> 
>+.include <bsd.port.options.mk>
>+
>+post-build:
>+.if ${PORT_OPTIONS:MMUNIN_PLUGIN}
>+	${REINPLACE_CMD} \
>+		-e 's|/usr/local|${LOCALBASE}|g' \
>+		-e 's|/usr/local/etc/nsd.conf|${ETCDIR}/nsd.conf|g' \
>+		-e 's|/usr/local/var/munin/plugin-state|/var/munin/plugin-state/root|g' \
>+		-e '90s|/var/munin/plugin-state/root|$${MUNIN_PLUGSTATE}|' \
>+		${WRKSRC}/contrib/nsd_munin_
>+.endif
>+
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/nsd.conf.sample \
> 		${STAGEDIR}${PREFIX}/etc/nsd/nsd.conf.sample
>@@ -84,5 +98,10 @@
> 		${STAGEDIR}${PREFIX}/sbin/nsd-checkconf \
> 		${STAGEDIR}${PREFIX}/sbin/nsd-checkzone \
> 		${STAGEDIR}${PREFIX}/sbin/nsd-control
>+.if ${PORT_OPTIONS:MMUNIN_PLUGIN}
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins
>+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/nsd_munin_ \
>+		${STAGEDIR}${PREFIX}/share/munin/plugins
>+.endif
> 
> .include <bsd.port.mk>
>Index: files/nsd.in
>===================================================================
>--- files/nsd.in	(revision 384983)
>+++ files/nsd.in	(working copy)
>@@ -21,7 +21,7 @@
> load_rc_config "${name}"
> : ${nsd_enable="NO"}
> 
>-config=${nsd_config:=%%PREFIX%%/etc/nsd/nsd.conf}
>+config=${nsd_config:=%%ETCDIR%%/nsd.conf}
> required_files=${config}
> pidfile=`%%PREFIX%%/sbin/nsd-checkconf -f -o pidfile ${config}`
> command="%%PREFIX%%/sbin/${name}"
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 384983)
>+++ pkg-plist	(working copy)
>@@ -9,6 +9,7 @@
> sbin/nsd-checkzone
> sbin/nsd-control
> sbin/nsd-control-setup
>+%%MUNIN_PLUGIN%%share/munin/plugins/nsd_munin_
> @dir(%%NSDUSER%%,%%NSDGROUP%%,0755) %%NSDRUNDIR%%
> @dir(%%NSDUSER%%,%%NSDGROUP%%,0755) %%NSDDBDIR%%
> @exec chown -R %%NSDUSER%%:%%NSDGROUP%% %%NSDRUNDIR%%

Actions: View | Diff

Attachments on bug 199798: 156131