system/icingaweb2: Updated for version 2.10.1.

Signed-off-by: Mario Preksavec <mario@slackware.hr>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 29 insertions, 12 deletions

diff --git a/system/icingaweb2/README b/system/icingaweb2/README
index 28da4628f5..b14db80084 100644
--- a/system/icingaweb2/README
+++ b/system/icingaweb2/README
@@ -4,3 +4,5 @@ Icinga Web 2 is the next generation open source monitoring web
 interface, framework and command-line interface developed by the
 Icinga Project, supporting Icinga 2, Icinga Core and any other
 monitoring backend compatible with the Livestatus Protocol.
+
+Optional dependency for exports to PDF: php-imagick
diff --git a/system/icingaweb2/doinst.sh b/system/icingaweb2/doinst.sh
index 0478b817bf..5c6c131feb 100644
--- a/system/icingaweb2/doinst.sh
+++ b/system/icingaweb2/doinst.sh
@@ -13,5 +13,9 @@ config() {
 
 config etc/httpd/extra/icingaweb2.conf.new
 
+[ ! -f etc/icingaweb2/setup.token ] \
+  && icingacli setup token create \
+  && chown apache:apache etc/icingaweb2/setup.token
+
 find etc/icingaweb2 -type f -name '*.new' \
   | while read new ; do config $new ; done
diff --git a/system/icingaweb2/icingaweb2.SlackBuild b/system/icingaweb2/icingaweb2.SlackBuild
index 3b5ceb0afd..6d0338d7ce 100644
--- a/system/icingaweb2/icingaweb2.SlackBuild
+++ b/system/icingaweb2/icingaweb2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for icingaweb2
 
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2022  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,11 +25,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=icingaweb2
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
+IPLVER=${IPLVER:-0.8.1}
+IPTVER=${IPTVER:-0.10.0}
+
 ARCH=noarch
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -66,7 +69,7 @@ find -L . \
 
 # Manual install
 mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX}/php,share/$PRGNAM/library} \
-  $PKG/etc/{$PRGNAM/modules,httpd/extra} $PKG/var/log/$PRGNAM \
+  $PKG/etc/{$PRGNAM/modules,httpd/extra} $PKG/var/{lib,log}/$PRGNAM \
   $PKG/usr/share/bash-completion/completions
 cp -a application modules public $PKG/usr/share/$PRGNAM
 cp -a library/Icinga $PKG/usr/lib${LIBDIRSUFFIX}/php
@@ -77,6 +80,13 @@ cp -a packages/files/config/modules/setup $PKG/etc/$PRGNAM/modules
 cp -a packages/files/public/index.php $PKG/usr/share/$PRGNAM/public
 cp -a packages/files/bin/icingacli $PKG/usr/bin
 
+# Required modules
+mkdir -p $PKG/usr/share/icinga-php/{ipl,vendor}
+tar xf $CWD/icinga-php-library-${IPLVER}.tar.gz --strip-components 1 \
+  -C $PKG/usr/share/icinga-php/ipl
+tar xf $CWD/icinga-php-thirdparty-${IPTVER}.tar.gz --strip-components 1 \
+  -C $PKG/usr/share/icinga-php/vendor
+
 # Change default paths
 sed -i "s#usr/share/doc/$PRGNAM/schema#usr/doc/$PRGNAM-$VERSION/schema#" \
   $PKG/etc/$PRGNAM/modules/setup/config.ini
@@ -86,11 +96,8 @@ sed -i "s#usr/share/php#usr/lib${LIBDIRSUFFIX}/php#" $PKG/usr/bin/icingacli \
 # Append .new to configs
 find $PKG/etc/httpd/extra $PKG/etc/$PRGNAM -type f -exec mv {} {}.new \;
 
-# Generate setup token
-head -c 12 /dev/urandom | base64 | tee $PKG/etc/$PRGNAM/setup.token
-
 # Apache needs permissions
-chown -R apache:apache $PKG/etc/$PRGNAM $PKG/var/log/$PRGNAM
+chown -R apache:apache $PKG/etc/$PRGNAM $PKG/var/{lib,log}/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/* etc/schema $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/icingaweb2/icingaweb2.info b/system/icingaweb2/icingaweb2.info
index 742df1e223..b998398c3e 100644
--- a/system/icingaweb2/icingaweb2.info
+++ b/system/icingaweb2/icingaweb2.info
@@ -1,8 +1,12 @@
 PRGNAM="icingaweb2"
-VERSION="2.1.0"
-HOMEPAGE="https://www.icinga.org/"
-DOWNLOAD="https://github.com/Icinga/icingaweb2/archive/v2.1.0.tar.gz"
-MD5SUM="8b2e8ad789b5cf31f5fac38a7513a301"
+VERSION="2.10.1"
+HOMEPAGE="https://www.icinga.com/"
+DOWNLOAD="https://github.com/Icinga/icingaweb2/archive/v2.10.1/icingaweb2-2.10.1.tar.gz \
+          https://github.com/Icinga/icinga-php-library/archive/v0.8.1/icinga-php-library-0.8.1.tar.gz \
+          https://github.com/Icinga/icinga-php-thirdparty/archive/v0.10.0/icinga-php-thirdparty-0.10.0.tar.gz"
+MD5SUM="87456d800ab39c1be6d8f682e3e06fbe \
+        6bb88cac67ac578189f3f1a5e0a7ccbb \
+        08a47aa73b02d52541bd5365f99aa60e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/icingaweb2/slack-desc b/system/icingaweb2/slack-desc
index f5a0a1a1e0..b28356992f 100644
--- a/system/icingaweb2/slack-desc
+++ b/system/icingaweb2/slack-desc
@@ -13,7 +13,7 @@ icingaweb2: interface, framework and command-line interface developed by the
 icingaweb2: Icinga Project, supporting Icinga 2, Icinga Core and any other
 icingaweb2: monitoring backend compatible with the Livestatus Protocol.
 icingaweb2:
-icingaweb2: Homepage: http://www.icinga.org/
+icingaweb2: Homepage: https://www.icinga.com/
 icingaweb2:
 icingaweb2:
 icingaweb2: