svn commit: r496686 - in head/sysutils/nut: . files

[Cy Schubert]

Author: cy
Date: Sat Mar 23 19:34:07 2019
New Revision: 496686
URL: https://svnweb.freebsd.org/changeset/ports/496686

Log:
  Move default log location so it can be rotated without root privileges.
  
  Add syslog.conf and newsyslog.conf files for installation into their
  respective .d directories in $PREFIX.
  
  Allow upslog log format to be customized.
  
  PR:		236700
  Submitted by:	Daniel O'Connor <darius at dons.net.au> (90%)

Added:
  head/sysutils/nut/files/nut.newsyslog   (contents, props changed)
  head/sysutils/nut/files/nut.syslog   (contents, props changed)
Modified:
  head/sysutils/nut/Makefile   (contents, props changed)
  head/sysutils/nut/files/nut_upslog.in
  head/sysutils/nut/pkg-plist   (contents, props changed)

Modified: head/sysutils/nut/Makefile
==============================================================================
--- head/sysutils/nut/Makefile	Sat Mar 23 19:26:45 2019	(r496685)
+++ head/sysutils/nut/Makefile	Sat Mar 23 19:34:07 2019	(r496686)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nut
 PORTVERSION=	2.7.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -187,6 +187,11 @@ post-install:
 .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
 .endif
 
 .include <bsd.port.mk>

Added: head/sysutils/nut/files/nut.newsyslog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/nut/files/nut.newsyslog	Sat Mar 23 19:34:07 2019	(r496686)
@@ -0,0 +1,7 @@
+# configuration file for newsyslog for nut
+#
+# see newsyslog.conf(5) for details
+#
+# logfilename          [owner:group]    mode    count   size    when    flags   [/pid_file]     	[sig_num]
+/var/log/nut/upsd.log   uucp:uucp       644     7       100     *       J       /var/db/nut/upslog.pid
+

Added: head/sysutils/nut/files/nut.syslog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/nut/files/nut.syslog	Sat Mar 23 19:34:07 2019	(r496686)
@@ -0,0 +1,2 @@
+!upsmon
+*.*					/var/log/nut/upsd.log

Modified: head/sysutils/nut/files/nut_upslog.in
==============================================================================
--- head/sysutils/nut/files/nut_upslog.in	Sat Mar 23 19:26:45 2019	(r496685)
+++ head/sysutils/nut/files/nut_upslog.in	Sat Mar 23 19:34:07 2019	(r496686)
@@ -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 at localhost"}
+# nut_upslog_format
 
 . /etc/rc.subr
 
@@ -31,6 +32,6 @@ load_rc_config $name
 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} ${nut_upslog_format:+-f \"${nut_upslog_format}\"}"}
 
 run_rc_command "$1"

Modified: head/sysutils/nut/pkg-plist
==============================================================================
--- head/sysutils/nut/pkg-plist	Sat Mar 23 19:26:45 2019	(r496685)
+++ head/sysutils/nut/pkg-plist	Sat Mar 23 19:34:07 2019	(r496686)
@@ -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/upsmon
 sbin/upssched
 @dir(%%NUT_USER%%,%%NUT_GROUP%%,750) %%STATEDIR%%
 @dir libexec/nut
+ at dir(%%NUT_USER%%,%%NUT_GROUP%%,) /var/log/nut