summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--TODO1
-rwxr-xr-xmisc/init.d/redhat/zabbix_agentd_ctl15
-rwxr-xr-xmisc/init.d/redhat/zabbix_suckerd_ctl13
4 files changed, 15 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fea27ca..b47b1ce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
Changes for 1.0beta11:
+ - updated RedHat start-up scripts in misc/init.d/redhat. Thanks
+ to Charlie. (Alexei)
- fix for flexible SNMP port name (Alexei)
- fixed permissions of PHP screens (Alexei)
- period in graphs. Thanks to Igor Micko. (Alexei)
diff --git a/TODO b/TODO
index 69eff408..c610d6f4 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,6 @@
- user groups
- start&end time in time navigation
- add Igor's patches
- - add Charlea RedHat startup scripts
- different colors and line styles for map connectors
diff --git a/misc/init.d/redhat/zabbix_agentd_ctl b/misc/init.d/redhat/zabbix_agentd_ctl
index ca74a785..fddd3402 100755
--- a/misc/init.d/redhat/zabbix_agentd_ctl
+++ b/misc/init.d/redhat/zabbix_agentd_ctl
@@ -2,10 +2,14 @@
#
# zabbix_agentd_ctl
#
-# control script to stop/start/restart zabbix_suckerd
+# control script to stop/start/restart zabbix_agentd
# author: charlie collins
# date: 01.21.2002
#
+# revised 09.21.2003
+# (setup for Red Hat 7.3 with Zabbix 1.0 beta)
+# (should work for other Red Hat and Sys V style init machines as well)
+#
# (modeled after apache style control scripts)
# (this script can be placed in init.d and respective runlevel for startup usage)
#
@@ -30,8 +34,8 @@
# base zabbix dir
BASEDIR=/opt/zabbix
-# PID file (PID FILE NOT CURRENTLY SET - NEEDS TO BE, THIS IS FOR FUTURE USE)
-PIDFILE=$BASEDIR/bin/zabbix_agentd.pid
+# pid file (as of 1.0 beta 10)
+PIDFILE=/var/tmp/zabbix_agentd.pid
# binary file
ZABBIX_AGENTD=$BASEDIR/bin/zabbix_agentd
@@ -47,11 +51,6 @@ if [ "x$ARGV" = "x" ] ; then
ARGS="help"
fi
-# establish PIDs
-# for now - ultimately PIDFILE should be implemented and managed in zabbix_agentd binary
-# output all process ids to PIDFILE manually
-ps -ef | awk '/zabbix_agentd/ && !/zabbix_agentd_ctl/ && !/awk/ {print $2}' > $PIDFILE
-
# perform action based on args
for ARG in $@ $ARGS
diff --git a/misc/init.d/redhat/zabbix_suckerd_ctl b/misc/init.d/redhat/zabbix_suckerd_ctl
index 196c64c9..7580690b 100755
--- a/misc/init.d/redhat/zabbix_suckerd_ctl
+++ b/misc/init.d/redhat/zabbix_suckerd_ctl
@@ -6,6 +6,10 @@
# author: charlie collins
# date: 01.21.2002
#
+# revised 09.21.2003
+# (setup for Red Hat 7.3 with Zabbix 1.0 beta)
+# (should work for other Red Hat and Sys V style init machines as well)
+#
# (modeled after apache style control scripts)
# (this script can be placed in init.d and respective runlevel for startup usage)
#
@@ -30,8 +34,8 @@
# base zabbix dir
BASEDIR=/opt/zabbix
-# PID file (PID FILE NOT CURRENTLY SET - NEEDS TO BE, THIS IS FOR FUTURE USE)
-PIDFILE=$BASEDIR/bin/zabbix_suckerd.pid
+# PID file
+PIDFILE=/var/tmp/zabbix_suckerd.pid
# binary file
ZABBIX_SUCKERD=$BASEDIR/bin/zabbix_suckerd
@@ -47,11 +51,6 @@ if [ "x$ARGV" = "x" ] ; then
ARGS="help"
fi
-# establish PIDs
-# for now - ultimately PIDFILE should be implemented and managed in zabbix_suckerd binary
-# output all process ids to PIDFILE manually
-ps -ef | awk '/zabbix_suckerd/ && !/zabbix_suckerd_ctl/ && !/awk/ {print $2}' > $PIDFILE
-
# perform action based on args
for ARG in $@ $ARGS