Date: Sun, 03 Mar 2013 14:29:11 -0600 From: Mark Felder <feld@feld.me> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/176624: [PATCH] net-mgmt/devmon: rc script tweaking Message-ID: <E1UCFWx-0000IY-6X@feld.me> Resent-Message-ID: <201303032030.r23KU2px025246@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176624
>Category: ports
>Synopsis: [PATCH] net-mgmt/devmon: rc script tweaking
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 03 20:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: feld
>Release: FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD mwi1.coffeenet.org 9.1-RELEASE FreeBSD 9.1-RELEASE #6 r243808: Mon Dec 3 07:51:34
>Description:
rc script changed to run as user "devmon"
pidfile stored in /var/run/devmon
make sure at start logfile exists and is writable
Below are lines to go in UIDs and GIDs files
UIDs:
devmon:*:283:283::0:0:Devmon daemon:/nonexistent:/usr/sbin/nologin
GIDs:
devmon:*:283:
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix)
>How-To-Repeat:
>Fix:
--- devmon-0.3.1.b1_1.patch begins here ---
diff -ruN --exclude=CVS ../devmon.orig/Makefile ./Makefile
--- ../devmon.orig/Makefile 2013-03-02 14:20:12.000000000 -0600
+++ ./Makefile 2013-03-03 13:11:56.000000000 -0600
@@ -3,6 +3,7 @@
PORTNAME= devmon
DISTVERSION= 0.3.1-beta1
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
@@ -17,6 +18,9 @@
NO_BUILD= yes
USE_RC_SUBR= devmon
+USERS= devmon
+GROUPS= devmon
+
OPTIONS_DEFINE= MYSQL
.include <bsd.port.options.mk>
@@ -36,8 +40,11 @@
(cd ${WRKSRC}/modules && ${COPYTREE_SHARE} \* ${PREFIX}/devmon/modules/)
post-install:
+ ${INSTALL} -d /var/run/devmon
+ ${CHOWN} devmon:devmon /var/run/devmon
+ ${CHOWN} devmon:devmon ${PREFIX}/devmon
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
+ ${INSTALL} -d ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
diff -ruN --exclude=CVS ../devmon.orig/files/devmon.in ./files/devmon.in
--- ../devmon.orig/files/devmon.in 2013-03-02 14:20:12.000000000 -0600
+++ ./files/devmon.in 2013-03-03 14:23:54.000000000 -0600
@@ -8,7 +8,8 @@
: ${devmon_enable="NO"}
: ${devmon_config="%%PREFIX%%/devmon/devmon.cfg"}
: ${devmon_db="%%PREFIX%%/devmon/hosts.db"}
-: ${devmon_pid="/var/run/devmon.pid"}
+: ${devmon_pid="/var/run/devmon/devmon.pid"} # match your entry in devmon.cfg
+: ${devmon_log="/var/log/devmon.log"} # match your entry in devmon.cfg
. /etc/rc.subr
@@ -22,10 +23,11 @@
stop_cmd="devmon_stopcmd"
status_cmd="devmon_statuscmd"
+start_cmd="devmon_startcmd"
devmon_statuscmd()
{
-if [ ! -e $pidfile ];
+if [ ! -e $pidfile ];
then
echo "pidfile does not exist. $name is not running?";
exit 1;
@@ -33,7 +35,8 @@
if pgrep -F $pidfile >/dev/null;
then
- echo "$name is running.";
+ mypid=`cat $pidfile`;
+ echo "$name is running as $mypid.";
else
echo "$name is not running.";
exit 1;
@@ -53,4 +56,11 @@
fi
}
+devmon_startcmd()
+{
+ touch ${devmon_log}
+ chown devmon:devmon ${devmon_log}
+ su -m devmon -c "${command_interpreter} ${command} ${command_args}"
+}
+
run_rc_command "$1"
diff -ruN --exclude=CVS ../devmon.orig/pkg-plist ./pkg-plist
--- ../devmon.orig/pkg-plist 2013-03-02 14:20:12.000000000 -0600
+++ ./pkg-plist 2013-03-03 14:25:04.235340823 -0600
@@ -28,3 +28,4 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir /var/run/devmon
--- devmon-0.3.1.b1_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1UCFWx-0000IY-6X>