summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Heß <janne@hess.ooo>2021-07-13 18:22:28 +0200
committerJanne Heß <janne@hess.ooo>2021-07-13 18:31:15 +0200
commit6d203a68c624bbedaa7995f88d2e1e091bdb97f4 (patch)
tree22b370a783aabf2d591e83188845d774c0475b86
parent3af5d881e0576325c572655a90c7604739804acc (diff)
nixos/icingaweb2: Add ipl and thirdparty libraries
These are required since 2.9.0
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml10
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
-rw-r--r--nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix18
3 files changed, 29 insertions, 1 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 53c1a18a507b..66a3f908129b 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -479,7 +479,7 @@
</itemizedlist>
</listitem>
</itemizedlist>
- <itemizedlist spacing="compact">
+ <itemizedlist>
<listitem>
<para>
<literal>yggdrasil</literal> was upgraded to a new major
@@ -488,6 +488,14 @@
changelog</link>.
</para>
</listitem>
+ <listitem>
+ <para>
+ <literal>icingaweb2</literal> was upgraded to a new release
+ which requires a manual database upgrade, see
+ <link xlink:href="https://github.com/Icinga/icingaweb2/releases/tag/v2.9.0">upstream
+ changelog</link>.
+ </para>
+ </listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-notable-changes">
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index ad56b5cd7d72..d270a362079e 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -120,6 +120,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0).
+- `icingaweb2` was upgraded to a new release which requires a manual database upgrade, see [upstream changelog](https://github.com/Icinga/icingaweb2/releases/tag/v2.9.0).
+
## Other Notable Changes {#sec-release-21.11-notable-changes}
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
index eea49bda283b..f8f0854f1bcb 100644
--- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
@@ -23,6 +23,16 @@ in {
'';
};
+ libraryPaths = mkOption {
+ type = attrsOf package;
+ default = { };
+ description = ''
+ Libraries to add to the Icingaweb2 library path.
+ The name of the attribute is the name of the library, the value
+ is the package to add.
+ '';
+ };
+
virtualHost = mkOption {
type = nullOr str;
default = "icingaweb2";
@@ -167,6 +177,9 @@ in {
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
${poolName} = {
user = "icingaweb2";
+ phpEnv = {
+ ICINGAWEB_LIBDIR = toString (pkgs.linkFarm "icingaweb2-libdir" (mapAttrsToList (name: path: { inherit name path; }) cfg.libraryPaths));
+ };
phpPackage = pkgs.php.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled);
phpOptions = ''
date.timezone = "${cfg.timezone}"
@@ -184,6 +197,11 @@ in {
};
};
+ services.icingaweb2.libraryPaths = {
+ ipl = pkgs.icingaweb2-ipl;
+ thirdparty = pkgs.icingaweb2-thirdparty;
+ };
+
systemd.services."phpfpm-${poolName}".serviceConfig.ReadWritePaths = [ "/etc/icingaweb2" ];
services.nginx = {