diff options
| -rw-r--r-- | network/zabbix_server/README | 2 | ||||
| -rw-r--r-- | network/zabbix_server/doinst.sh | 19 | ||||
| -rw-r--r-- | network/zabbix_server/zabbix_server.SlackBuild | 18 | ||||
| -rw-r--r-- | network/zabbix_server/zabbix_server.info | 12 |
4 files changed, 28 insertions, 23 deletions
diff --git a/network/zabbix_server/README b/network/zabbix_server/README index e5c11daa57..2b4dc15f62 100644 --- a/network/zabbix_server/README +++ b/network/zabbix_server/README @@ -12,3 +12,5 @@ ZABBIXUSER and ZABBIXGROUP variables when running the build script. For some important post-build and basic configuration instructions, see the included README.SLACKWARE file. + +This conflicts with zabbix_proxy package. diff --git a/network/zabbix_server/doinst.sh b/network/zabbix_server/doinst.sh index a27b5a564e..a24b013d4e 100644 --- a/network/zabbix_server/doinst.sh +++ b/network/zabbix_server/doinst.sh @@ -1,13 +1,13 @@ config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... } preserve_perms() { @@ -25,4 +25,3 @@ preserve_perms etc/rc.d/rc.zabbix_server.new config etc/zabbix/zabbix_server.conf.new config var/log/zabbix/zabbix_server.log.new rm -f var/log/zabbix/zabbix_server.log.new - diff --git a/network/zabbix_server/zabbix_server.SlackBuild b/network/zabbix_server/zabbix_server.SlackBuild index ad5da6405d..829bf97ab7 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 2010-2011 Niels Horn, Rio de Janeiro, RJ, Brazil +# Copyright 2012 Michal Bialozor, Gdansk, POLAND # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# revision date 2011/12/30 - PRGNAM=zabbix_server -VERSION=${VERSION:-1.8.10} +VERSION=${VERSION:-1.8.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -105,7 +103,10 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-server \ --with-mysql \ --with-net-snmp \ + --with-jabber \ --with-libcurl \ + --with-ssh2 \ + --with-ldap \ --build=$ARCH-slackware-linux make @@ -124,7 +125,7 @@ cp -a frontends/php/* \ chown -R $PHPUSER:$PHPGROUP $PKG/$DOCROOT/$PRGSHORT # Database scripts -mkdir -p $PKG/usr/share/$PRGNAM/{create,upgrades} +mkdir -p $PKG/usr/share/$PRGNAM/create $PKG/usr/share/$PRGNAM/upgrades cp -a create/data create/schema \ $PKG/usr/share/$PRGNAM/create/ cp -a upgrades/dbpatches \ @@ -132,7 +133,7 @@ cp -a upgrades/dbpatches \ # Initial log file mkdir -p $PKG/var/log/$PRGSHORT -touch $PKG/var/log/$PRGSHORT/${PRGNAM}.log.new +touch $PKG/var/log/$PRGSHORT/$PRGNAM.log.new chown -R $ZABBIXUSER:$ZABBIXGROUP $PKG/var/log/$PRGSHORT # Dir for pid-file @@ -140,15 +141,18 @@ mkdir -p $PKG/var/run/$PRGSHORT chown -R $ZABBIXUSER:$ZABBIXGROUP $PKG/var/run/$PRGSHORT # Configuration file -mkdir -p $PKG/etc/$PRGSHORT/externalscripts +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 +# Init script mkdir -p $PKG/etc/rc.d 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 \ $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/network/zabbix_server/zabbix_server.info b/network/zabbix_server/zabbix_server.info index ed316e9af4..3a8c5f389a 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.10" +VERSION="1.8.15" HOMEPAGE="http://www.zabbix.com" -DOWNLOAD="http://downloads.sourceforge.net/zabbix/zabbix-1.8.10.tar.gz" -MD5SUM="7e89f80c1822787c0831f7c0dbefcd7b" +DOWNLOAD="http://downloads.sourceforge.net/zabbix/zabbix-1.8.15.tar.gz" +MD5SUM="bb1951b20c61c0f576c824d06f8318a6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Niels Horn" -EMAIL="niels.horn@gmail.com" +REQUIRES="iksemel libssh2" +MAINTAINER="Michal Bialozor" +EMAIL="bialyy@o2.pl" |