diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 6f92c0ca5e58..2fd4b98574f4 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -190,14 +190,6 @@ let mysqlLocal = cfg.database.createLocally && cfg.config.dbtype == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.config.dbtype == "pgsql"; - nextcloudGreaterOrEqualThan = versionAtLeast overridePackage.version; - nextcloudOlderThan = versionOlder overridePackage.version; - - # https://github.com/nextcloud/documentation/pull/11179 - ocmProviderIsNotAStaticDirAnymore = - nextcloudGreaterOrEqualThan "27.1.2" - || (nextcloudOlderThan "27.0.0" && nextcloudGreaterOrEqualThan "26.0.8"); - overrideConfig = let c = cfg.config; @@ -1235,7 +1227,7 @@ in ] ++ runtimeSystemdCredentials; # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent # an automatic creation of the database user. - environment.NC_setup_create_db_user = lib.mkIf (nextcloudGreaterOrEqualThan "26") "false"; + environment.NC_setup_create_db_user = "false"; }; nextcloud-cron = { after = [ "nextcloud-setup.service" ]; @@ -1457,9 +1449,7 @@ in priority = 500; extraConfig = '' # legacy support (i.e. static files and directories in cfg.package) - rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[s${ - optionalString (!ocmProviderIsNotAStaticDirAnymore) "m" - }]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; + rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; include ${config.services.nginx.package}/conf/fastcgi.conf; fastcgi_split_path_info ^(.+?\.php)(\\/.*)$; set $path_info $fastcgi_path_info; @@ -1487,13 +1477,10 @@ in default_type application/wasm; } ''; - "~ ^\\/(?:updater|ocs-provider${ - optionalString (!ocmProviderIsNotAStaticDirAnymore) "|ocm-provider" - })(?:$|\\/)".extraConfig = - '' - try_files $uri/ =404; - index index.php; - ''; + "~ ^\\/(?:updater|ocs-provider)(?:$|\\/)".extraConfig = '' + try_files $uri/ =404; + index index.php; + ''; "/remote" = { priority = 1500; extraConfig = ''