[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Update: symon 2.63
- To: ports_(_at_)_openbsd_(_dot_)_org
- Subject: Update: symon 2.63
- From: Willem Dijkstra <wpd_(_at_)_xs4all_(_dot_)_nl>
- Date: 06 Feb 2004 13:58:45 +0100
The port used to consist of symon / symux and symon2web. I removed the "web"
subpackage as the (new) web frontend is distributed seperately. Also, symon now
runs as user _symon.
Should there be a port for the web stuff (just a bunch of php scripts) ?
Cheers,
Willem
diff -ru symon/Makefile symon.new/Makefile
--- symon/Makefile Tue Sep 23 01:56:38 2003
+++ symon.new/Makefile Sun Jan 11 15:23:27 2004
@@ -1,10 +1,10 @@
COMMENT= "active monitoring tool"
-V= 2.60
+V= 2.63
DISTNAME= symon-${V}
CATEGORIES= sysutils net
-HOMEPAGE= http://www.xs4all.nl/~wpd/symon/
+HOMEPAGE= http://www.xs4all.nl/~wpd/symon
MAINTAINER= Willem Dijkstra <wpd_(_at_)_xs4all_(_dot_)_nl>
# BSD
@@ -14,7 +14,7 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= ${HOMEPAGE}/philes/
SUBPACKAGE?=
@@ -22,17 +22,12 @@
MULTI_PACKAGES+= -mon
COMMENT-mon= "active host monitor"
MON_LIBDEPENDS=
-MON_RUNDEPENDS=
+MON_RUNDEPENDS=
# gatherer only package
MULTI_PACKAGES+= -mux
COMMENT-mux= "symon data gatherer"
-MUX_LIBDEPENDS= rrd:rrdtool-*:net/rrdtool
-MUX_RUNDEPENDS= rrd:rrdtool-*:net/rrdtool
-# web frontend only package
-MULTI_PACKAGES+= -web
-COMMENT-web= "symon web frontend"
-WEB_LIBDEPENDS=
-WEB_RUNDEPENDS= rrd:rrdtool-*:net/rrdtool php:php4-core->=4.2.3:www/php4/core
+MUX_LIBDEPENDS= rrd:rrdtool-*:net/rrdtool
+MUX_RUNDEPENDS= rrd:rrdtool-*:net/rrdtool
.for i in ${MULTI_PACKAGES}
FULLPKGNAME${i}= symon${i}-${V}
@@ -44,9 +39,9 @@
RUN_DEPENDS= ${${MODULE_NAME:U}_RUNDEPENDS}
MESSAGE= ${PKGDIR}/MESSAGE${SUBPACKAGE}
.else
-BUILD_DEPENDS= rrd:rrdtool-*:net/rrdtool
-RUN_DEPENDS= rrd:rrdtool-*:net/rrdtool php:php4-core->=4.2.3:www/php4/core
-LIB_DEPENDS= rrd:rrdtool-*:net/rrdtool
+BUILD_DEPENDS= rrd:rrdtool-*:net/rrdtool
+RUN_DEPENDS= rrd:rrdtool-*:net/rrdtool
+LIB_DEPENDS= rrd:rrdtool-*:net/rrdtool
.endif
WRKDIST= ${WRKDIR}/symon
diff -ru symon/distinfo symon.new/distinfo
--- symon/distinfo Tue Apr 1 00:13:51 2003
+++ symon.new/distinfo Sun Jan 11 15:23:27 2004
@@ -1,3 +1,3 @@
-MD5 (symon-2.60.tar.gz) = 8b57c61078faf5d5eaadef5f342d8306
-RMD160 (symon-2.60.tar.gz) = 36650923c893b4521e4c9f584f2b547925a070ff
-SHA1 (symon-2.60.tar.gz) = c2f7dd6df28cd02a37d79358effefc262c74a5fa
+MD5 (symon-2.63.tar.gz) = d5a203d924fd3c131200d93575289333
+RMD160 (symon-2.63.tar.gz) = d7df4290ffa8481f2b46010c49977ba7adaa4efb
+SHA1 (symon-2.63.tar.gz) = 9d648c629b0ea6f4ac488ca8cd953235b7fdf9f0
Only in symon: patches
diff -ru symon/pkg/DEINSTALL symon.new/pkg/DEINSTALL
--- symon/pkg/DEINSTALL Tue Feb 4 23:59:48 2003
+++ symon.new/pkg/DEINSTALL Sun Jan 11 15:23:27 2004
@@ -7,6 +7,8 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=${SYSCONFDIR}/symon.conf
+SYMONUSER=_symon
+SYMONGROUP=_symon
if [ -e $CONFIG_FILE ]; then
echo
@@ -14,6 +16,8 @@
echo "| To completely deinstall the $1 package you need to perform"
echo "| this step as root:"
echo "|"
+ echo "| userdel $SYMONUSER"
+ echo "| groupdel $SYMONGROUP"
echo "| rm -f $CONFIG_FILE"
echo "|"
echo "| Do not do this if you plan on re-installing $1"
diff -ru symon/pkg/DEINSTALL-mon symon.new/pkg/DEINSTALL-mon
--- symon/pkg/DEINSTALL-mon Tue Feb 18 00:54:49 2003
+++ symon.new/pkg/DEINSTALL-mon Sun Jan 11 15:23:27 2004
@@ -7,6 +7,8 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=${SYSCONFDIR}/symon.conf
+SYMONUSER=_symon
+SYMONGROUP=_symon
if [ -e $CONFIG_FILE ]; then
echo
@@ -14,6 +16,8 @@
echo "| To completely deinstall the $1 package you need to perform"
echo "| this step as root:"
echo "|"
+ echo "| userdel $SYMONUSER"
+ echo "| groupdel $SYMONGROUP"
echo "| rm -f $CONFIG_FILE"
echo "|"
echo "| Do not do this if you plan on re-installing $1"
diff -ru symon/pkg/DESCR symon.new/pkg/DESCR
--- symon/pkg/DESCR Sun Mar 2 06:39:06 2003
+++ symon.new/pkg/DESCR Sun Jan 11 15:23:27 2004
@@ -2,9 +2,8 @@
interface and disk statistics every 5 seconds. This information is
then spooled over "the network" to symux for further processing.
-The port will yield 4 packages:
-symon-mon-${V}.tgz : symon daemon and manual
-symon-mux-${V}.tgz : symux daemon, manual and auxiliary scripts
-symon-web-${V}.tgz : web frontend
+The port will yield 3 packages:
+symon-mon-${V}.tgz : symon daemon and manual.
+symon-mux-${V}.tgz : symux daemon, manual and rrd creation script.
symon-${V}.tgz : all of the above rolled into a single package
Only in symon/pkg: DESCR-web
diff -ru symon/pkg/INSTALL symon.new/pkg/INSTALL
--- symon/pkg/INSTALL Fri Aug 1 17:52:16 2003
+++ symon.new/pkg/INSTALL Sun Jan 11 15:23:27 2004
@@ -10,7 +10,27 @@
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=${SYSCONFDIR}/symon.conf
SAMPLE_CONFIG_FILE=$PREFIX/share/examples/symon/symon.conf
+SYMONUSER=_symon
+SYMONGROUP=_symon
+ID=525
+do_usergroup_install()
+{
+ # Create symon user and group
+ if groupinfo -e $SYMONGROUP; then
+ echo "===> Using $SYMONGROUP group for symon"
+ else
+ echo "===> Creating $SYMONGROUP group for symon"
+ groupadd -g $ID $SYMONGROUP
+ fi
+ if userinfo -e $SYMONUSER; then
+ echo "===> Using $SYMONUSER user for symon"
+ else
+ echo "===> Creating $SYMONUSER user for symon"
+ useradd -g $SYMONGROUP -d /var/empty -L daemon -c 'symon Account' -s /sbin/nologin -u $ID $SYMONUSER
+ fi
+}
+
do_notice()
{
echo
@@ -34,7 +54,7 @@
echo "| pf, default disks and interfaces. Please review this file and change"
echo "| the configuration to suit your needs."
echo "+---------------"
- echo
+ echo
}
# verify proper execution
@@ -48,8 +68,8 @@
#
case $2 in
PRE-INSTALL)
- : nothing to pre-install for this port
- ;;
+ do_usergroup_install
+ ;;
POST-INSTALL)
if [ -f $CONFIG_FILE ]; then
do_notice $1
@@ -56,12 +76,11 @@
else
do_install $1
fi
- ;;
+ ;;
*)
- echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
- exit 1
- ;;
+ echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+ exit 1
+ ;;
esac
exit 0
-
diff -ru symon/pkg/INSTALL-mon symon.new/pkg/INSTALL-mon
--- symon/pkg/INSTALL-mon Fri Aug 1 17:52:16 2003
+++ symon.new/pkg/INSTALL-mon Sun Jan 11 15:23:27 2004
@@ -10,7 +10,27 @@
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=${SYSCONFDIR}/symon.conf
SAMPLE_CONFIG_FILE=$PREFIX/share/examples/symon/symon.conf
+SYMONUSER=_symon
+SYMONGROUP=_symon
+ID=525
+do_usergroup_install()
+{
+ # Create symon user and group
+ if groupinfo -e $SYMONGROUP; then
+ echo "===> Using $SYMONGROUP group for symon"
+ else
+ echo "===> Creating $SYMONGROUP group for symon"
+ groupadd -g $ID $SYMONGROUP
+ fi
+ if userinfo -e $SYMONUSER; then
+ echo "===> Using $SYMONUSER user for symon"
+ else
+ echo "===> Creating $SYMONUSER user for symon"
+ useradd -g $SYMONGROUP -d /var/empty -L daemon -c 'symon Account' -s /sbin/nologin -u $ID $SYMONUSER
+ fi
+}
+
do_notice()
{
echo
@@ -34,7 +54,7 @@
echo "| pf, default disks and interfaces. Please review this file and change"
echo "| the configuration to suit your needs."
echo "+---------------"
- echo
+ echo
}
# verify proper execution
@@ -48,8 +68,8 @@
#
case $2 in
PRE-INSTALL)
- : nothing to pre-install for this port
- ;;
+ do_usergroup_install
+ ;;
POST-INSTALL)
if [ -f $CONFIG_FILE ]; then
do_notice $1
@@ -56,11 +76,11 @@
else
do_install $1
fi
- ;;
+ ;;
*)
- echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
- exit 1
- ;;
+ echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+ exit 1
+ ;;
esac
exit 0
diff -ru symon/pkg/MESSAGE symon.new/pkg/MESSAGE
--- symon/pkg/MESSAGE Tue Oct 8 09:56:42 2002
+++ symon.new/pkg/MESSAGE Sun Jan 11 15:23:27 2004
@@ -1,6 +1,6 @@
+---------------
| Example configurations for both symon and symux have been installed
-| in ${PREFIX}/share/symon.
+| in ${PREFIX}/share/examples/symon.
|
| RRD files can be obtained by running
| ${PREFIX}/share/symon/c_smrrds.sh
diff -ru symon/pkg/MESSAGE-mon symon.new/pkg/MESSAGE-mon
--- symon/pkg/MESSAGE-mon Tue Oct 8 09:56:42 2002
+++ symon.new/pkg/MESSAGE-mon Sun Jan 11 15:23:27 2004
@@ -1,4 +1,4 @@
+---------------
| An example configuration for symon has been installed in
-| ${PREFIX}/share/symon.
+| ${PREFIX}/share/examples/symon.
+---------------
diff -ru symon/pkg/MESSAGE-mux symon.new/pkg/MESSAGE-mux
--- symon/pkg/MESSAGE-mux Tue Oct 8 09:56:42 2002
+++ symon.new/pkg/MESSAGE-mux Sun Jan 11 15:23:27 2004
@@ -1,6 +1,6 @@
+---------------
| An example configuration for symux has been installed in
-| ${PREFIX}/share/symon.
+| ${PREFIX}/share/examples/symon.
|
| RRD files can be obtained by running
| ${PREFIX}/share/symon/c_smrrds.sh
Only in symon/pkg: MESSAGE-web
diff -ru symon/pkg/PLIST symon.new/pkg/PLIST
--- symon/pkg/PLIST Thu Oct 16 18:44:48 2003
+++ symon.new/pkg/PLIST Sun Jan 11 15:23:27 2004
@@ -6,30 +6,11 @@
man/cat8/symux.0
share/examples/symon/symon.conf
share/examples/symon/symux.conf
-share/symon/c_config.sh
share/symon/c_smrrds.sh
-share/symon/web/class_cpu.inc
-share/symon/web/class_graph.inc
-share/symon/web/class_if.inc
-share/symon/web/class_io.inc
-share/symon/web/class_mem.inc
-share/symon/web/class_pf.inc
-share/symon/web/class_debug.inc
-share/symon/web/class_proc.inc
-share/symon/web/datasources.inc
-share/symon/web/graph_cpu.php
-share/symon/web/graph_if.php
-share/symon/web/graph_io.php
-share/symon/web/graph_mem.php
-share/symon/web/graph_pf.php
-share/symon/web/index.php
-share/symon/web/symon.css
-share/symon/web/symon.png
-share/symon/web/spacer.png
-share/symon/web/test_config.php
+share/symon/c_config.sh
share/symon/client/getsymonitem.pl
share/symon/client/SymuxClient.pm
share/symon/client/SymuxClient.0
-_(_at_)_dirrm share/symon/web
+_(_at_)_dirrm share/examples/symon
@dirrm share/symon/client
@dirrm share/symon
diff -ru symon/pkg/PLIST-mon symon.new/pkg/PLIST-mon
--- symon/pkg/PLIST-mon Tue Apr 1 00:13:51 2003
+++ symon.new/pkg/PLIST-mon Sun Jan 11 15:23:27 2004
@@ -4,4 +4,5 @@
man/cat8/symon.0
share/examples/symon/symon.conf
share/symon/c_config.sh
+_(_at_)_dirrm share/examples/symon
@dirrm share/symon
diff -ru symon/pkg/PLIST-mux symon.new/pkg/PLIST-mux
--- symon/pkg/PLIST-mux Tue Apr 1 00:13:51 2003
+++ symon.new/pkg/PLIST-mux Sun Jan 11 15:23:27 2004
@@ -7,5 +7,6 @@
share/symon/client/getsymonitem.pl
share/symon/client/SymuxClient.pm
share/symon/client/SymuxClient.0
+_(_at_)_dirrm share/examples/symon
@dirrm share/symon/client
@dirrm share/symon
Only in symon/pkg: PLIST-web
Visit your host, monkey.org