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

diff --git a/zabbix.spec b/zabbix.spec
index 665f3f2..3f2e548 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -195,6 +195,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
@@ -221,7 +222,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