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

diff --git a/zabbix.spec b/zabbix.spec
index 665f3f2..5a5f490 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -3,7 +3,7 @@
 %define _prefix		/usr/local/zabbix
 
 Name:		zabbix
-Version:	1.6.1
+Version:	1.6
 Release:	1
 Group:		System Environment/Daemons
 License:	GPL
@@ -11,7 +11,7 @@ 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
@@ -170,11 +170,15 @@ 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
 
 %post server
@@ -195,6 +199,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 +209,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 +230,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