icingaweb2: 2.4.0 -> 2.5.1

3 files changed, 41 insertions, 26 deletions

diff --git a/modules/apps/icingaweb2.nix b/modules/apps/icingaweb2.nix
index 0bb24fe..3881b75 100644
--- a/modules/apps/icingaweb2.nix
+++ b/modules/apps/icingaweb2.nix
@@ -41,7 +41,7 @@ let
     users = default [] (listOf str);
     groups = default [] (listOf str);
     permissions = mandatory (listOf permission);
-    objects = mandatory str;
+    objects = optional str;
   };
 
   database = attrs {
@@ -182,7 +182,6 @@ let
     mkdir -p '${cfg.configDir}/modules/monitoring'
 
     ln -sf '${pkgs.icingaweb2}/modules/monitoring' '${cfg.configDir}/enabledModules/monitoring'
-    ln -sf '${pkgs.icingaweb2}/modules/translation' '${cfg.configDir}/enabledModules/translation'
     ${genResourcesIni} > '${cfg.configDir}/resources.ini'
     ln -sf '${authenticationIni}' '${cfg.configDir}/authentication.ini'
     ln -sf '${configIni}' '${cfg.configDir}/config.ini'
@@ -360,7 +359,6 @@ in {
         devops = {
           groups = [ "devops" ];
           permissions = [ "module/*" "monitoring/command/*" ];
-          objects = "*";
         };
         all = {
           groups = [ "all" ];
diff --git a/modules/pkgs/icingaweb2/default.nix b/modules/pkgs/icingaweb2/default.nix
index d0fbcc3..5c5cce6 100644
--- a/modules/pkgs/icingaweb2/default.nix
+++ b/modules/pkgs/icingaweb2/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.0";
+  version = "2.5.1";
   name = "icingaweb2-${version}";
 
   src = fetchurl {
     url = "https://github.com/Icinga/icingaweb2/archive/v${version}.tar.gz";
-    sha256 = "15kn0sm4dcpm6hcpbinas2dvbz2ln2frrcsw0i3acnk51qm1p35a";
+    sha256 = "047s43amqj0i4k4xfac3n0784yvzphv3b9kirr4wycvn9pcz06d4";
   };
 
   patches = [ ./sproxy.patch ];
@@ -18,14 +18,17 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     cp -a * $out
-    rm -rf $out/.puppet
-    rm -rf $out/Vagrantfile
-    rm -rf $out/icingaweb2.spec
-    rm -rf $out/modules/doc
-    rm -rf $out/modules/iframe
-    rm -rf $out/modules/setup
-    rm -rf $out/modules/test
-    rm -rf $out/packages
-    rm -rf $out/test
+
+    cd $out
+    rm -rvf \
+        .??* \
+        Vagrantfile \
+        icingaweb2.spec \
+        modules/doc \
+        modules/setup \
+        modules/test \
+        modules/translation \
+        packages \
+        test
   '';
 }
diff --git a/modules/pkgs/icingaweb2/sproxy.patch b/modules/pkgs/icingaweb2/sproxy.patch
index d1b074d..234bee7 100644
--- a/modules/pkgs/icingaweb2/sproxy.patch
+++ b/modules/pkgs/icingaweb2/sproxy.patch
@@ -1,17 +1,20 @@
-commit 04eb7cffa84387070f48f5649a1d5a5a7843fc9c
-Author: Igor Pashev <pashev.igor@gmail.com>
-Date:   Fri Jan 1 11:05:48 2016 +0300
+From 64d9685260f93b5c2f18cc7abbc862575e5b2904 Mon Sep 17 00:00:00 2001
+From: Igor Pashev <pashev.igor@gmail.com>
+Date: Thu, 19 Apr 2018 13:27:24 +0300
+Subject: [PATCH] Add Sproxy backend
 
-    Added Sproxy backend
-
-    See https://github.com/zalora/sproxy
+---
+ .../Icinga/Authentication/User/SproxyBackend.php   | 51 ++++++++++++++++++++++
+ library/Icinga/Authentication/User/UserBackend.php |  6 +++
+ 2 files changed, 57 insertions(+)
+ create mode 100644 library/Icinga/Authentication/User/SproxyBackend.php
 
 diff --git a/library/Icinga/Authentication/User/SproxyBackend.php b/library/Icinga/Authentication/User/SproxyBackend.php
 new file mode 100644
-index 0000000..4b15b0e
+index 0000000000..f36c362374
 --- /dev/null
 +++ b/library/Icinga/Authentication/User/SproxyBackend.php
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,51 @@
 +<?php
 +/* 2016 Zalora South East Asia Pte. Ltd | GPLv2+ */
 +
@@ -21,8 +24,19 @@ index 0000000..4b15b0e
 +use Icinga\User;
 +
 +/**
-+ * Login with Sproxy authentication mechanism:
-+ * https://github.com/zalora/sproxy
++ * Login with Sproxy authentication mechanism.
++ * This is similar to the "external" backend.
++ *
++ * Sproxy provides at least two HTTP headers:
++ *
++ * "From" - the user's email address.
++ * "X-Groups" - a comma-separated list of the user's groups.
++ *
++ *
++ * See <https://hackage.haskell.org/package/sproxy2>,
++ *  or <https://github.com/ip1981/sproxy2>,
++ *  or <https://gitlab.com/ip1981/sproxy2>,
++ *  or <https://bitbucket.org/IgorPashev/sproxy2>.
 + */
 +class SproxyBackend extends ExternalBackend
 +{
@@ -53,7 +67,7 @@ index 0000000..4b15b0e
 +    }
 +}
 diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
-index 3b8e210..d264365 100644
+index 8130c56cde..366b84fd4f 100644
 --- a/library/Icinga/Authentication/User/UserBackend.php
 +++ b/library/Icinga/Authentication/User/UserBackend.php
 @@ -22,6 +22,7 @@ class UserBackend implements ConfigAwareFactory
@@ -64,7 +78,7 @@ index 3b8e210..d264365 100644
          'external',
          'db',
          'ldap',
-@@ -176,6 +177,11 @@ class UserBackend implements ConfigAwareFactory
+@@ -176,6 +177,11 @@ public static function create($name, ConfigObject $backendConfig = null)
              $backend->setName($name);
              return $backend;
          }