diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-17 18:00:54 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-17 18:00:54 +0000 |
commit | 100b3bb178766fe871d7387cdcab19b0b6fab0f9 (patch) | |
tree | 221cace5c6fb6a641cf452dc6b6af66dc81a6423 /nixos/modules/services | |
parent | dbc9291fb25827d068570f4f10c4efe7638171ca (diff) | |
parent | 1c30e585f2a4f43eefa8845d05e967b47918eaa7 (diff) | |
download | nixlib-100b3bb178766fe871d7387cdcab19b0b6fab0f9.tar nixlib-100b3bb178766fe871d7387cdcab19b0b6fab0f9.tar.gz nixlib-100b3bb178766fe871d7387cdcab19b0b6fab0f9.tar.bz2 nixlib-100b3bb178766fe871d7387cdcab19b0b6fab0f9.tar.lz nixlib-100b3bb178766fe871d7387cdcab19b0b6fab0f9.tar.xz nixlib-100b3bb178766fe871d7387cdcab19b0b6fab0f9.tar.zst nixlib-100b3bb178766fe871d7387cdcab19b0b6fab0f9.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/web-apps/engelsystem.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/web-apps/engelsystem.nix b/nixos/modules/services/web-apps/engelsystem.nix index 669620debce5..7fb912415643 100644 --- a/nixos/modules/services/web-apps/engelsystem.nix +++ b/nixos/modules/services/web-apps/engelsystem.nix @@ -3,6 +3,8 @@ let inherit (lib) mkDefault mkEnableOption mkIf mkOption types mkPackageOption; cfg = config.services.engelsystem; + phpExt = pkgs.php.withExtensions + ({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql mbstring ] ++ enabled); in { options = { services.engelsystem = { @@ -99,7 +101,7 @@ in { ''; services.phpfpm.pools.engelsystem = { - phpPackage = pkgs.php81; + phpPackage = phpExt; user = "engelsystem"; settings = { "listen.owner" = config.services.nginx.user; |