From 448538cfc4346e0cc8be1d10ed6abc73da7a4173 Mon Sep 17 00:00:00 2001 From: hugetoad Date: Fri, 11 Aug 2006 10:04:56 +0000 Subject: - fixed Unknown when selcting trigger severity Disaster in action form (Alexei) git-svn-id: svn://svn.zabbix.com/trunk@3120 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- misc/specs/zabbix-agentd-1.1.1.spec | 57 +++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 28 deletions(-) (limited to 'misc/specs') diff --git a/misc/specs/zabbix-agentd-1.1.1.spec b/misc/specs/zabbix-agentd-1.1.1.spec index 471cfd86..eb96b00c 100644 --- a/misc/specs/zabbix-agentd-1.1.1.spec +++ b/misc/specs/zabbix-agentd-1.1.1.spec @@ -1,7 +1,5 @@ %define debug_package %{nil} -%define _prefix /usr/local/zabbix - Name: zabbix-agentd Version: 1.1.1 Release: 2 @@ -11,19 +9,24 @@ Summary: ZABBIX network monitor agent Vendor: ZABBIX SIA URL: http://www.zabbix.org Packager: Alexey Zilber -Source: zabbix-1.1.1.tar.gz +Source: zabbix-%{version}.tar.gz Autoreq: no Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -#Prefix: %{_prefix} +Prefix: /usr/local/zabbix +Prefix: /var/run +Prefix: /var/log + +Requires: sed +Requires(post): chkconfig, initscripts +Requires(preun): chkconfig, initscripts +Requires(postun): initscripts -%define zabbix_bindir %{_prefix}/bin +%define zabbix_bindir /usr/local/zabbix/bin %define zabbix_confdir /etc/zabbix %define zabbix_initdir /etc/rc.d/init.d %define zabbix_docdir /usr/share/doc/%{name}-%{version}-%{release} -#%define zabbix_piddir %{_tmppath} -#%define zabbix_logdir %{_tmppath} %define zabbix_piddir /var/run/zabbix %define zabbix_logdir /var/log/zabbix @@ -32,7 +35,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot The ZABBIX agent is a network monitor %prep -%setup -n zabbix-1.1.1 +%setup -n zabbix-%{version} %build %configure --enable-agent @@ -50,6 +53,8 @@ install -m 644 AUTHORS %{buildroot}%{zabbix_docdir}/AUTHORS install -m 644 COPYING %{buildroot}%{zabbix_docdir}/COPYING install -m 644 NEWS %{buildroot}%{zabbix_docdir}/NEWS install -m 644 README %{buildroot}%{zabbix_docdir}/README +install -m 644 ChangeLog %{buildroot}%{zabbix_docdir}/ChangeLog + # copy binaries install -d %{buildroot}%{zabbix_bindir} @@ -75,30 +80,25 @@ if [ -z "`grep zabbix /etc/passwd`" ]; then fi # configure ZABBIX agent daemon -TMP_FILE=`mktemp $TMPDIR/zbxtmpXXXXXX` -mkdir -p /var/run/zabbix -mkdir -p /var/log/zabbix -sed -e "s#Hostname=localhost#Hostname=`uname -n`#g" \ - -e "s#PidFile=/var/tmp/zabbix_agentd.pid#PidFile=%{zabbix_piddir}/zabbix_agentd.pid#g" \ - -e "s#LogFile=/tmp/zabbix_agentd.log#LogFile=%{zabbix_logdir}/zabbix_agentd.log#g" \ - -e "s#\#RefreshActiveChecks=120#RefreshActiveChecks=600#g" \ - -e "s#\#DisableActive=1#DisableActive=0#g" \ - -e "s#Timeout=3#Timeout=30#g" \ - -e "s#DebugLevel=3#DebugLevel=2#g" \ - %{zabbix_confdir}/zabbix_agentd.conf > $TMP_FILE -cat $TMP_FILE > %{zabbix_confdir}/zabbix_agentd.conf +mkdir -p %{zabbix_piddir} +mkdir -p %{zabbix_logdir} +%{__sed} -i -e 's|Hostname=localhost|Hostname=`uname -n`|g' \ + -e 's|PidFile=/var/tmp/zabbix_agentd.pid|PidFile=%{zabbix_piddir}/zabbix_agentd.pid|g' \ + -e 's|LogFile=/tmp/zabbix_agentd.log|LogFile=%{zabbix_logdir}/zabbix_agentd.log|g' \ + -e 's|#RefreshActiveChecks=120|RefreshActiveChecks=600|g' \ + -e 's|#DisableActive=1|DisableActive=0|g' \ + -e 's|Timeout=3|Timeout=30|g' \ + -e 's|DebugLevel=3|DebugLevel=2|g' \ + %{zabbix_confdir}/zabbix_agentd.conf chown zabbix.zabbix %{zabbix_piddir} chown zabbix.zabbix %{zabbix_logdir} -sed -e "s#progdir=\"/usr/local/zabbix/bin/\"#USER=zabbix; progdir=\"%{zabbix_bindir}/\"; conffile=\"%{zabbix_confdir}/zabbix_agentd.conf\"#g" \ - -e "s#su -c \$progdir\$prog - \$USER#su -c \"\$progdir\$prog -c \$conffile\" - \$USER#g" \ - %{zabbix_initdir}/zabbix_agentd > $TMP_FILE -cat $TMP_FILE > %{zabbix_initdir}/zabbix_agentd - -rm -f $TMP_FILE +%{__sed} -i -e 's|progdir=\"/usr/local/zabbix/bin/\"|USER=zabbix; progdir=\"%{zabbix_bindir}/\"; conffile=\"%{zabbix_confdir}/zabbix_agentd.conf\"|g' \ + -e 's|su -c \$progdir\$prog - \$USER|su -c \"\$progdir\$prog -c \$conffile\" - \$USER|g' \ + %{zabbix_initdir}/zabbix_agentd chkconfig --add zabbix_agentd chkconfig --levels 345 zabbix_agentd on %preun -if [ -n "`pidof zabbix_agentd`" ]; then +if [ -n "`/sbin/pidof zabbix_agentd`" ]; then service zabbix_agentd stop sleep 2 fi @@ -112,6 +112,7 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log %attr(0644,root,root) %{zabbix_docdir}/COPYING %attr(0644,root,root) %{zabbix_docdir}/NEWS %attr(0644,root,root) %{zabbix_docdir}/README +%attr(0644,root,root) %{zabbix_docdir}/ChangeLog %dir %attr(0755,root,root) %{zabbix_confdir} %attr(0644,root,root) %config(noreplace) %{zabbix_confdir}/zabbix_agentd.conf @@ -126,7 +127,7 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log * Wed Jul 19 2006 Alexey Zilber - 1.1.1 - Updated packaging, cleaned up directory structure for -- RedHat compatibility, added uninstall checks. +- RedHat compatibility, added uninstall,build checks. * Thu Dec 01 2005 Eugene Grigorjev - 1.1beta2 - initial packaging -- cgit