Unverified Commit 1db72d9a authored by Piotr Kwiecinski's avatar Piotr Kwiecinski
Browse files

nixos/monica: add phpPackage option and pass it to phpfpm pool

fixes nixosTests.monica failure
parent 4ad50473
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ let
  user = cfg.user;
  group = cfg.group;

  php = lib.getExe pkgs.php83;
  php = lib.getExe cfg.phpPackage;

  # shell script for local administration
  artisan = pkgs.writeScriptBin "monica" ''
@@ -38,6 +38,8 @@ in
  options.services.monica = {
    enable = mkEnableOption "monica";

    phpPackage = mkPackageOption pkgs "php83" { };

    user = mkOption {
      default = "monica";
      description = "User monica runs as.";
@@ -342,6 +344,7 @@ in

    services.phpfpm.pools.monica = {
      inherit user group;
      phpPackage = cfg.phpPackage;
      phpOptions = ''
        log_errors = on
        post_max_size = ${cfg.maxUploadSize}