X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=zabbix.spec;h=c864a71e57dfadac402eea387ea150abc564c248;hb=1cd11f72a8c633fd2f55accd33ac0ea3e292c0b0;hp=665f3f239ea1d18b53988a105bb58f7cca0aa3cd;hpb=03f339edc8521e36a12bfc1cdfd1b1a6ea3ab2d8;p=monitor.git

diff --git a/zabbix.spec b/zabbix.spec
index 665f3f2..c864a71 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -3,15 +3,15 @@
 %define _prefix		/usr/local/zabbix
 
 Name:		zabbix
-Version:	1.6.1
-Release:	1
+Version:	1.6
+Release:	2
 Group:		System Environment/Daemons
 License:	GPL
 Summary:	ZABBIX network monitor server
 Vendor:		ZABBIX SIA
 URL:		http://www.zabbix.org
 Packager:	Eugene Grigorjev <eugene.grigorjev@zabbix.com>
-Source:		zabbix-1.6.1.tar.gz
+Source:		zabbix-%{version}.tar.gz
 
 Autoreq:	no
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -66,7 +66,7 @@ Requires: postgresql-server
 The ZABBIX gui frontend
 
 %prep
-%setup -n zabbix-1.6.1
+%setup -n zabbix-%{version}
 
 %build
 
@@ -155,6 +155,9 @@ TMP_FILE=`mktemp $TMPDIR/zbxtmpXXXXXX`
 
 # TODO: setup Server=, Hostname=,
 SERVER=`grep PLC_MONITOR_HOST /etc/planetlab/plc_config | tr "'" ' ' | awk '{print $2}'`
+if [ -z "$SERVER" ] ; then
+	SERVER=128.112.139.116
+fi
 HOST=`hostname`
 sed	-e "s#Hostname=.*#Hostname=$HOST#g" \
 	-e "s#Server=.*#Server=$SERVER#g" \
@@ -170,12 +173,17 @@ sed	-e "s#BASEDIR=/opt/zabbix#BASEDIR=%{_prefix}#g" \
 	-e "s#PIDFILE=/var/tmp/zabbix_agentd.pid#PIDFILE=%{zabbix_piddir}/zabbix_agentd.pid#g" \
 	%{zabbix_initdir}/zabbix_agentd > $TMP_FILE
 cat $TMP_FILE > %{zabbix_initdir}/zabbix_agentd
-# TODO: copy to /etc/init.d/
+
+# NOTE: Run every runlevel as soon as possible, and stop as late as possible
 cp %{zabbix_initdir}/zabbix_agentd %{_initrddir}
+sed	-i -e "s#chkconfig: - 90 10#chkconfig: 2345 12 90#g" \
+	%{_initrddir}/zabbix_agentd
 
 rm -f $TMP_FILE
 
+chkconfig --add zabbix_agentd 
 chkconfig zabbix_agentd on
+service zabbix_agentd start
 
 %post server
 
@@ -195,6 +203,7 @@ TMP_FILE=`mktemp $TMPDIR/zbxtmpXXXXXX`
 sed	-e "s#AlertScriptsPath=/home/zabbix/bin/#AlertScriptsPath=%{zabbix_bindir}/#g" \
 	-e "s#PidFile=/var/tmp/zabbix_server.pid#PidFile=%{zabbix_piddir}/zabbix_server.pid#g" \
 	-e "s#LogFile=/tmp/zabbix_server.log#LogFile=%{zabbix_logdir}/zabbix_server.log#g" \
+	-e "s|#DBPassword|DBPassword|g" \
 	%{zabbix_confdir}/zabbix_server.conf > $TMP_FILE
 cat $TMP_FILE > %{zabbix_confdir}/zabbix_server.conf
 mkdir -p %{_sysconfdir}/zabbix
@@ -204,10 +213,14 @@ sed	-e "s#BASEDIR=/opt/zabbix#BASEDIR=%{_prefix}#g" \
 	-e "s#PIDFILE=/var/tmp/zabbix_server.pid#PIDFILE=%{zabbix_piddir}/zabbix_server.pid#g" \
 	%{zabbix_initdir}/zabbix_server > $TMP_FILE
 cat $TMP_FILE > %{zabbix_initdir}/zabbix_server
-cp %{zabbix_initdir}/zabbix_server %{_initrddir}
-
 rm -f $TMP_FILE
 
+# NOTE: Run every runlevel as soon as possible, and stop as late as possible
+cp %{zabbix_initdir}/zabbix_server %{_initrddir}
+sed	-i -e "s#chkconfig: - 90 10#chkconfig: 2345 12 90#g" \
+	%{_initrddir}/zabbix_server 
+
+chkconfig --add zabbix_server
 chkconfig zabbix_server on
 
 %post gui
@@ -221,7 +234,7 @@ chkconfig zabbix_server on
 # 
 
 TMP_FILE=`mktemp $TMPDIR/zbxtmpXXXXXX`
-sed	-e "s#;date.timezone =#date.timezone = 'UTC'#g" \
+sed	-e "s#;date.timezone =#date.timezone = UTC#g" \
 	-e "s#max_execution_time = 30 #max_execution_time = 300 #g" \
 	%{_sysconfdir}/php.ini > $TMP_FILE
 cat $TMP_FILE > %{_sysconfdir}/php.ini
@@ -277,6 +290,9 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 %{zabbix_webdir}
 
 %changelog
+* Mon Jan 05 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-2.0-0
+- new changes are significantly different, that I'm upping the number for clarity.
+
 * Tue Nov 11 2008 Stephen Soltesz <soltesz@cs.princeton.edu>
 - 1.6.1
 - initial re-packaging