Attachment 203030 Details for Bug 236700 – Patch

[patch] Patch

nut-upslog-add-flags.diff (text/plain), 2.98 KB, created by Daniel O'Connor on 2019-03-21 11:49:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel O'Connor

Created: 2019-03-21 11:49:40 UTC

Size: 2.98 KB

patch

obsolete

>diff -Nur /usr/ports/sysutils/nut/Makefile nut/Makefile
>--- /usr/ports/sysutils/nut/Makefile	2018-11-09 13:47:51.000000000 +0000
>+++ nut/Makefile	2019-03-21 11:44:41.946631000 +0000
>@@ -187,6 +187,12 @@
> .for file in AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING
> 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
> .endfor
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d
>+	${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${PREFIX}/etc/syslog.d/nut
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
>+	${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/nut.conf
>+	${MKDIR} ${STAGEDIR}/var/log/nut
>+	${CHOWN} ${NUT_USER}: ${STAGEDIR}var/log/nut
> .endif
> 
> .include <bsd.port.mk>
>diff -Nur /usr/ports/sysutils/nut/files/nut.newsyslog nut/files/nut.newsyslog
>--- /usr/ports/sysutils/nut/files/nut.newsyslog	1970-01-01 00:00:00.000000000 +0000
>+++ nut/files/nut.newsyslog	2019-03-21 11:46:45.820465000 +0000
>@@ -0,0 +1 @@
>+/var/log/nut/upsd.log 644 100 7 * J /var/db/nut/upslog.pid
>diff -Nur /usr/ports/sysutils/nut/files/nut.syslog nut/files/nut.syslog
>--- /usr/ports/sysutils/nut/files/nut.syslog	1970-01-01 00:00:00.000000000 +0000
>+++ nut/files/nut.syslog	2019-03-21 11:46:50.590178000 +0000
>@@ -0,0 +1,2 @@
>+!upsmon
>+*.*					/var/log/nut/upsd.log
>diff -Nur /usr/ports/sysutils/nut/files/nut_upslog.in nut/files/nut_upslog.in
>--- /usr/ports/sysutils/nut/files/nut_upslog.in	2018-11-09 13:47:51.000000000 +0000
>+++ nut/files/nut_upslog.in	2019-03-21 11:46:33.570663000 +0000
>@@ -17,9 +17,10 @@
> #
> nut_upslog_enable=${nut_upslog_enable:-"NO"}
> nut_upslog_prefix=${nut_upslog_prefix:-"%%PREFIX%%"}
>-nut_upslog_logfile=${nut_upslog_logfile:-"/var/log/ups.log"}
>+nut_upslog_logfile=${nut_upslog_logfile:-"/var/log/nut/ups.log"}
> nut_upslog_interval=${nut_upslog_interval:-"300"}
> nut_upslog_ups=${nut_upslog_ups:-"myups@localhost"}
>+nut_upslog_format=${nut_upslog_format:-"%TIME @Y@m@d @H@M@S% %VAR battery.charge% %VAR input.voltage% %VAR ups.load% [%VAR ups.status%] %VAR ups.temperature% %VAR input.frequency%"}
> 
> . /etc/rc.subr
> 
>@@ -31,6 +32,6 @@
> required_dirs="%%STATEDIR%%"
> command="${nut_upslog_prefix}/bin/upslog"
> pidfile="%%STATEDIR%%/upslog.pid"
>-nut_upslog_flags=${nut_upslog_flags:-"-s ${nut_upslog_ups} -l ${nut_upslog_logfile} -i ${nut_upslog_interval}"}
>+nut_upslog_flags=${nut_upslog_flags:-"-s ${nut_upslog_ups} -l ${nut_upslog_logfile} -i ${nut_upslog_interval} -f \"${nut_upslog_format}\""}
> 
> run_rc_command "$1"
>diff -Nur /usr/ports/sysutils/nut/pkg-plist nut/pkg-plist
>--- /usr/ports/sysutils/nut/pkg-plist	2015-09-18 11:14:22.000000000 +0000
>+++ nut/pkg-plist	2019-03-21 11:45:52.933839000 +0000
>@@ -17,6 +17,8 @@
> %%ETCDIR%%/upsd.users.sample
> %%ETCDIR%%/upsmon.conf.sample
> %%ETCDIR%%/upssched.conf.sample
>+etc/newsyslog.conf.d/nut.conf
>+etc/syslog.d/nut
> %%NUT_USB%%etc/devd/nut-usb.conf
> @stopdaemon nut_upsmon
> @stopdaemon nut_upslog
>@@ -247,3 +249,4 @@
> sbin/upssched
> @dir(%%NUT_USER%%,%%NUT_GROUP%%,750) %%STATEDIR%%
> @dir libexec/nut
>+@dir /var/log/nut

Actions: View | Diff

Attachments on bug 236700: 203030 | 203062 | 203063