diff options
| -rw-r--r-- | network/zabbix_server/README.SLACKWARE | 3 | ||||
| -rw-r--r-- | network/zabbix_server/rc.zabbix_server | 15 | ||||
| -rw-r--r-- | network/zabbix_server/zabbix_server.SlackBuild | 25 | ||||
| -rw-r--r-- | network/zabbix_server/zabbix_server.info | 8 |
4 files changed, 26 insertions, 25 deletions
diff --git a/network/zabbix_server/README.SLACKWARE b/network/zabbix_server/README.SLACKWARE index fd2024bfe581f..9de0a2decc1a1 100644 --- a/network/zabbix_server/README.SLACKWARE +++ b/network/zabbix_server/README.SLACKWARE @@ -18,8 +18,7 @@ least the MySQL client on the box that will run zabbix_server. 0.1) zabbix group & user Before running the zabbix_server.SlackBuild script, you will need to create -the 'zabbix' user and group. The script won't run if these do not -exist. +the 'zabbix' user and group. The script won't run if these do not exist. The suggested UID and GID is 228, but you can change this as needed: diff --git a/network/zabbix_server/rc.zabbix_server b/network/zabbix_server/rc.zabbix_server index 5a900ca1e8005..67a0e6457507b 100644 --- a/network/zabbix_server/rc.zabbix_server +++ b/network/zabbix_server/rc.zabbix_server @@ -1,6 +1,6 @@ #!/bin/sh -# usage: ./rc.zabbix_server { start | stop | restart } +# Usage: ./rc.zabbix_server {start|stop|restart} PRGNAM=zabbix_server PRGDIR=/usr/sbin/ @@ -10,7 +10,7 @@ DATE=$(date +%a\ %b\ %d\ %T\ %Y) RETVAL=0 prg_start() { - echo -n "Starting $PRGNAM ... " + echo -n "Starting $PRGNAM ... " if [ -r ${PIDDIR}${PRGNAM}.pid ]; then if $(! /sbin/pidof $PRGNAM > /dev/null 2>&1 ) ; then echo "Removing an old ${PIDDIR}${PRGNAM}.pid" @@ -23,15 +23,15 @@ prg_start() { if [ $RETVAL -eq 0 ]; then touch /var/lock/$PRGNAM sleep 2 - echo "Done" + echo "done" else - echo "Failed" + echo "failed" fi return $RETVAL } prg_stop() { - echo -n "Stopping $PRGNAM ... " + echo -n "Stopping $PRGNAM ... " if [ -r ${PIDDIR}${PRGNAM}.pid ]; then killall $PRGNAM # Give it some time to die gracefully @@ -48,7 +48,7 @@ prg_stop() { sleep 10 else echo "$DATE EXIT: $PRGNAM stopped by user: $USER (UID: $EUID)" >> ${LOGDIR}${PRGNAM}.log - echo "Done" + echo "done" fi fi rm -f /var/lock/$PRGNAM @@ -70,8 +70,7 @@ case "$1" in prg_start ;; *) - echo "" - echo "Usage: $(basename $0) {start | stop | restart }" + echo "Usage: $(basename $0) {start|stop|restart }" RETVAL=1 esac diff --git a/network/zabbix_server/zabbix_server.SlackBuild b/network/zabbix_server/zabbix_server.SlackBuild index 94426f2b12eb5..4da5434a23f51 100644 --- a/network/zabbix_server/zabbix_server.SlackBuild +++ b/network/zabbix_server/zabbix_server.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for zabbix_server -# Copyright 2012 Michal Bialozor, Gdansk, POLAND +# Copyright 2013 Michal Bialozor, Gdansk, Pomorskie, POLAND # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zabbix_server -VERSION=${VERSION:-1.8.16} +VERSION=${VERSION:-2.0.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -95,16 +95,17 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/zabbix \ + --datadir=/etc \ --localstatedir=/var/lib \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-server \ --with-mysql \ - --with-net-snmp \ --with-jabber \ --with-libcurl \ + --with-net-snmp \ --with-ssh2 \ --with-ldap \ --build=$ARCH-slackware-linux @@ -125,9 +126,9 @@ cp -a frontends/php/* \ chown -R $PHPUSER:$PHPGROUP $PKG/$DOCROOT/$PRGSHORT # Database scripts -mkdir -p $PKG/usr/share/$PRGNAM/create $PKG/usr/share/$PRGNAM/upgrades -cp -a create/data create/schema \ - $PKG/usr/share/$PRGNAM/create/ +mkdir -p $PKG/usr/share/$PRGNAM/database/mysql +cp -a database/mysql \ + $PKG/usr/share/$PRGNAM/database/ cp -a upgrades/dbpatches \ $PKG/usr/share/$PRGNAM/upgrades/ @@ -135,18 +136,19 @@ cp -a upgrades/dbpatches \ mkdir -p $PKG/var/log/$PRGSHORT touch $PKG/var/log/$PRGSHORT/$PRGNAM.log.new chown -R $ZABBIXUSER:$ZABBIXGROUP $PKG/var/log/$PRGSHORT +chmod g+w $PKG/var/log/$PRGSHORT # Dir for pid-file mkdir -p $PKG/var/run/$PRGSHORT chown -R $ZABBIXUSER:$ZABBIXGROUP $PKG/var/run/$PRGSHORT +chmod g+w $PKG/var/run/$PRGSHORT # Configuration file -mkdir -p $PKG/etc/$PRGSHORT/alertscripts $PKG/etc/$PRGSHORT/externalscripts \ - $PKG/etc/$PRGSHORT/zabbix_server.conf.d sed -e "s,# PidFile=/tmp/,PidFile=/var/run/$PRGSHORT/," \ -e "s,# DBSocket=/tmp/,DBSocket=/var/run/mysql/," \ -e "s,LogFile=/tmp/,LogFile=/var/log/$PRGSHORT/," \ - misc/conf/$PRGNAM.conf > $PKG/etc/$PRGSHORT/$PRGNAM.conf.new + $PKG/etc/$PRGSHORT/$PRGNAM.conf > $PKG/etc/$PRGSHORT/$PRGNAM.conf.new +rm -f $PKG/etc/$PRGSHORT/$PRGNAM.conf # Init script mkdir -p $PKG/etc/rc.d @@ -154,11 +156,12 @@ cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new # Documentation mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog CREDITS INSTALL NEWS README \ +cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE +# Installation scripts mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/network/zabbix_server/zabbix_server.info b/network/zabbix_server/zabbix_server.info index ff9797827baad..1aa1967b28280 100644 --- a/network/zabbix_server/zabbix_server.info +++ b/network/zabbix_server/zabbix_server.info @@ -1,10 +1,10 @@ PRGNAM="zabbix_server" -VERSION="1.8.16" +VERSION="2.0.6" HOMEPAGE="http://www.zabbix.com" -DOWNLOAD="http://downloads.sourceforge.net/zabbix/zabbix-1.8.16.tar.gz" -MD5SUM="891b7a5c915f3060b66687a483dc0551" +DOWNLOAD="http://downloads.sourceforge.net/zabbix/zabbix-2.0.6.tar.gz" +MD5SUM="f7261987731dd74b58cb1da890655ddc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="iksemel libssh2" +REQUIRES="iksemel jdk libssh2" MAINTAINER="Michal Bialozor" EMAIL="bialyy@o2.pl" |