Update Icinga Web 2 to 2.4.1

3 files changed, 21 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0079397a657..b02b47435cce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Dec 17 13:00:23 UTC 2016
+# Sun Jan 22 20:45:48 UTC 2017
 pkgbase = icingaweb2
 	pkgdesc = Icinga Web 2 Interface
-	pkgver = 2.4.0
+	pkgver = 2.4.1
 	pkgrel = 1
 	url = http://www.icinga.org
 	install = icingaweb2.install
@@ -12,8 +12,8 @@ pkgbase = icingaweb2
 	optdepends = php-gd: export data to PDF
 	optdepends = php-intl: support for internationalization
 	optdepends = php-pgsql: for PostgreSQL backend
-	source = https://github.com/Icinga/icingaweb2/archive/v2.4.0.tar.gz
-	sha256sums = aa8c1b2a0e655aa646045cb39c9db054fcb59bd0cac6751934f5b246aa067696
+	source = https://github.com/Icinga/icingaweb2/archive/v2.4.1.tar.gz
+	sha256sums = 27150d96a2172d0fa0c77389970052a1bf7aa6553494e80837f6699e96e24bc6
 
 pkgname = icingaweb2
 
diff --git a/PKGBUILD b/PKGBUILD
index ca815b291f8e..10dc955f2f2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Malte Rabenseifner <mail@malte-rabenseifner.de>
 
 pkgname=icingaweb2
-pkgver=2.4.0
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="Icinga Web 2 Interface"
 license=('GPL')
@@ -13,7 +13,7 @@ optdepends=('php-gd: export data to PDF'
 url="http://www.icinga.org"
 source=("https://github.com/Icinga/${pkgname}/archive/v${pkgver}.tar.gz")
 install='icingaweb2.install'
-sha256sums=('aa8c1b2a0e655aa646045cb39c9db054fcb59bd0cac6751934f5b246aa067696')
+sha256sums=('27150d96a2172d0fa0c77389970052a1bf7aa6553494e80837f6699e96e24bc6')
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -24,14 +24,14 @@ package() {
   mkdir -p "$pkgdir/usr/share/webapps/icingaweb2"
   mkdir -p "$pkgdir/var/log/icingaweb2"
 
-  cp -r application doc library modules public bin "$pkgdir/usr/share/webapps/icingaweb2"
+  cp -r application bin doc library modules public "$pkgdir/usr/share/webapps/icingaweb2"
+  cp -r --parents etc/schema "$pkgdir/usr/share/webapps/icingaweb2"
   ln -s /usr/share/webapps/icingaweb2/bin/icingacli "$pkgdir/usr/bin/icingacli"
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/icingaweb2/LICENSE"
   install -Dm644 etc/bash_completion.d/icingacli "$pkgdir/etc/bash_completion.d/icingacli"
-  cp -r etc/schema "$pkgdir/usr/share/icingaweb2"
 
   #chmod 2770 "$pkgdir/etc/webapps/icingaweb2"
   chmod 2770 "$pkgdir/etc/icingaweb2"
-  chmod 750 "$pkgdir/var/log/icingaweb2"
+  chmod 2770 "$pkgdir/var/log/icingaweb2"
 }
diff --git a/icingaweb2.install b/icingaweb2.install
index eddc01300373..b80bcb47b142 100644
--- a/icingaweb2.install
+++ b/icingaweb2.install
@@ -1,12 +1,18 @@
 post_install() {
-  getent group icingacmd &> /dev/null && usermod -a -G icingacmd http &> /dev/null
+  /usr/bin/getent group icingaweb2 &> /dev/null || /usr/bin/groupadd -r icingaweb2 &> /dev/null
+  /usr/bin/getent group icingacmd &> /dev/null && /usr/bin/usermod -a -G icingacmd icingaweb2 &> /dev/null
+  /usr/bin/getent group icingaweb2 &> /dev/null && /usr/bin/usermod -a -G icingaweb2 http &> /dev/null
 
-  #chown -R root:http /etc/webapps/icingaweb2
-  chown -R root:http /etc/icingaweb
-  chown -R http:http /var/log/icingaweb2
+  post_upgrade
+}
+
+post_upgrade() {
+  #/usr/bin/chown -R root:icingaweb2 /etc/webapps/icingaweb2
+  /usr/bin/chown -R root:icingaweb2 /etc/icingaweb2
+  /usr/bin/chown -R root:icingaweb2 /var/log/icingaweb2
 }
 
 post_remove() {
-  echo "    You may remove the user 'http' from group 'icingacmd' by running"
-  echo "    'gpasswd -d http icingacmd' if no other icinga web interface is installed."
+  /usr/bin/getent group icingacmd &> /dev/null && /usr/bin/gpasswd -d icingacmd icingaweb2 &> /dev/null
+  /usr/bin/getent group icingaweb2 &> /dev/null && /usr/bin/groupdel icingaweb2 &> /dev/null
 }