diff options
| author | Janne Heß <dasJ@users.noreply.github.com> | 2024-05-07 11:27:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-07 11:27:33 +0200 |
| commit | b4c779678a84e1f7ffe08a8aba067bdceaae4b14 (patch) | |
| tree | 428ee9bb03ec5e51dbd2d384a68ca1664c79c59b /nixos | |
| parent | 478fb785fbbb9282ab562ede277b30bb780a8275 (diff) | |
| parent | e633f8b7c1099abd121b3b36efff15916995f64d (diff) | |
Merge pull request #308261 from Ma27/nextcloud-2311
[23.11] nextcloud29: init at 29.0.0, nextcloud28: 28.0.4 -> 28.0.5, nextcloud27: 27.1.8 -> 27.1.9
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 9 | ||||
| -rw-r--r-- | nixos/tests/nextcloud/default.nix | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 34dc07162dfde..3980012e66d64 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -228,7 +228,7 @@ in { package = mkOption { type = types.package; description = lib.mdDoc "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud26" "nextcloud27" "nextcloud28" ]; + relatedPackages = [ "nextcloud26" "nextcloud27" "nextcloud28" "nextcloud29" ]; }; phpPackage = mkOption { type = types.package; @@ -761,7 +761,8 @@ in { services.nextcloud.phpPackage = if versionOlder cfg.package.version "26" then pkgs.php81 - else pkgs.php82; + else if versionOlder cfg.package.version "29" then pkgs.php82 + else pkgs.php83; services.nextcloud.phpOptions = mkMerge [ (mapAttrs (const mkOptionDefault) defaultPHPSettings) @@ -1124,10 +1125,10 @@ in { extraConfig = '' absolute_redirect off; location = /.well-known/carddav { - return 301 /remote.php/dav; + return 301 /remote.php/dav/; } location = /.well-known/caldav { - return 301 /remote.php/dav; + return 301 /remote.php/dav/; } location ~ ^/\.well-known/(?!acme-challenge|pki-validation) { return 301 /index.php$request_uri; diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 84ac371537271..f625c107be226 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -22,4 +22,4 @@ foldl }; }) { } - [ 26 27 28 ] + [ 26 27 28 29 ] |