diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2023-03-22 19:57:23 +0100 |
|---|---|---|
| committer | Raito Bezarius <masterancpp@gmail.com> | 2023-03-22 22:37:17 +0100 |
| commit | cbc539c19fb9f95bb513eb724757bded539a8ae9 (patch) | |
| tree | f3780425b1a1b093e47f9bb93cc79968d46c0eb2 /nixos | |
| parent | 6a0b0a5de9b563254ae886d9e1709acd43e612b5 (diff) | |
nixos/nextcloud: minor fixups
* Apply review comments. * Default to PHP 8.2 for v26.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 6 | ||||
| -rw-r--r-- | nixos/tests/nextcloud/openssl-sse.nix | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index f42375c3d50d1..438b3baf314d0 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -204,7 +204,7 @@ in { package = mkOption { type = types.package; description = lib.mdDoc "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud24" "nextcloud25" ]; + relatedPackages = [ "nextcloud24" "nextcloud25" "nextcloud26" ]; }; phpPackage = mkOption { type = types.package; @@ -728,8 +728,8 @@ in { ); services.nextcloud.phpPackage = - if versionOlder cfg.package.version "24" then pkgs.php80 - else pkgs.php81; + if versionOlder cfg.package.version "26" then pkgs.php81 + else pkgs.php82; } { assertions = [ diff --git a/nixos/tests/nextcloud/openssl-sse.nix b/nixos/tests/nextcloud/openssl-sse.nix index cf7187323ab5e..871947e1d2b20 100644 --- a/nixos/tests/nextcloud/openssl-sse.nix +++ b/nixos/tests/nextcloud/openssl-sse.nix @@ -80,7 +80,6 @@ in { nextcloudwithopenssl1.succeed("grep bye /var/lib/nextcloud/data/root/files/test-shared-file2") nextcloudwithopenssl1.succeed("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file2 | grep bye") - with subtest("Switch back to OpenSSL 1.1 and ensure that encrypted files are readable again"): nextcloudwithopenssl1.succeed("${openssl1-node}/bin/switch-to-configuration test") nextcloudwithopenssl1.wait_for_open_port(80) |