|
|
|
|
@ -85,7 +85,7 @@ in {
|
|
|
|
|
package = mkOption {
|
|
|
|
|
type = types.package;
|
|
|
|
|
description = "Which package to use for the Nextcloud instance.";
|
|
|
|
|
relatedPackages = [ "nextcloud18" "nextcloud19" ];
|
|
|
|
|
relatedPackages = [ "nextcloud18" "nextcloud19" "nextcloud20" ];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
maxUploadSize = mkOption {
|
|
|
|
|
@ -330,37 +330,28 @@ in {
|
|
|
|
|
}
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
warnings = []
|
|
|
|
|
++ (optional (cfg.poolConfig != null) ''
|
|
|
|
|
warnings = let
|
|
|
|
|
latest = 20;
|
|
|
|
|
upgradeWarning = major: nixos:
|
|
|
|
|
''
|
|
|
|
|
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
|
|
|
|
|
|
|
|
|
|
After nextcloud${toString major} is installed successfully, you can safely upgrade
|
|
|
|
|
to ${toString (major + 1)}. The latest version available is nextcloud${toString latest}.
|
|
|
|
|
|
|
|
|
|
Please note that Nextcloud doesn't support upgrades across multiple major versions
|
|
|
|
|
(i.e. an upgrade from 16 is possible to 17, but not 16 to 18).
|
|
|
|
|
|
|
|
|
|
The package can be upgraded by explicitly declaring the service-option
|
|
|
|
|
`services.nextcloud.package`.
|
|
|
|
|
'';
|
|
|
|
|
in (optional (cfg.poolConfig != null) ''
|
|
|
|
|
Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release.
|
|
|
|
|
Please migrate your configuration to config.services.nextcloud.poolSettings.
|
|
|
|
|
'')
|
|
|
|
|
++ (optional (versionOlder cfg.package.version "18") ''
|
|
|
|
|
A legacy Nextcloud install (from before NixOS 20.03) may be installed.
|
|
|
|
|
|
|
|
|
|
You're currently deploying an older version of Nextcloud. This may be needed
|
|
|
|
|
since Nextcloud doesn't allow major version upgrades that skip multiple
|
|
|
|
|
versions (i.e. an upgrade from 16 is possible to 17, but not 16 to 18).
|
|
|
|
|
|
|
|
|
|
It is assumed that Nextcloud will be upgraded from version 16 to 17.
|
|
|
|
|
|
|
|
|
|
* If this is a fresh install, there will be no upgrade to do now.
|
|
|
|
|
|
|
|
|
|
* If this server already had Nextcloud installed, first deploy this to your
|
|
|
|
|
server, and wait until the upgrade to 17 is finished.
|
|
|
|
|
|
|
|
|
|
Then, set `services.nextcloud.package` to `pkgs.nextcloud18` to upgrade to
|
|
|
|
|
Nextcloud version 18. Please note that Nextcloud 19 is already out and it's
|
|
|
|
|
recommended to upgrade to nextcloud19 after that.
|
|
|
|
|
'')
|
|
|
|
|
++ (optional (versionOlder cfg.package.version "19") ''
|
|
|
|
|
A legacy Nextcloud install (from before NixOS 20.09) may be installed.
|
|
|
|
|
|
|
|
|
|
If/After nextcloud18 is installed successfully, you can safely upgrade to
|
|
|
|
|
nextcloud19. If not, please upgrade to nextcloud18 first since Nextcloud doesn't
|
|
|
|
|
support upgrades that skip multiple versions (i.e. an upgrade from 17 to 19 isn't
|
|
|
|
|
possible, but an upgrade from 18 to 19).
|
|
|
|
|
'');
|
|
|
|
|
++ (optional (versionOlder cfg.package.version "18") (upgradeWarning 17 "20.03"))
|
|
|
|
|
++ (optional (versionOlder cfg.package.version "19") (upgradeWarning 18 "20.09"))
|
|
|
|
|
++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.03"));
|
|
|
|
|
|
|
|
|
|
services.nextcloud.package = with pkgs;
|
|
|
|
|
mkDefault (
|
|
|
|
|
@ -372,7 +363,8 @@ in {
|
|
|
|
|
''
|
|
|
|
|
else if versionOlder stateVersion "20.03" then nextcloud17
|
|
|
|
|
else if versionOlder stateVersion "20.09" then nextcloud18
|
|
|
|
|
else nextcloud19
|
|
|
|
|
else if versionOlder stateVersion "21.03" then nextcloud19
|
|
|
|
|
else nextcloud20
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -435,7 +427,7 @@ in {
|
|
|
|
|
then ''"$(<"${toString c.dbpassFile}")"''
|
|
|
|
|
else if c.dbpass != null
|
|
|
|
|
then ''"${toString c.dbpass}"''
|
|
|
|
|
else null;
|
|
|
|
|
else ''""'';
|
|
|
|
|
adminpass = if c.adminpassFile != null
|
|
|
|
|
then ''"$(<"${toString c.adminpassFile}")"''
|
|
|
|
|
else ''"${toString c.adminpass}"'';
|
|
|
|
|
@ -449,8 +441,7 @@ in {
|
|
|
|
|
${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
|
|
|
|
|
${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
|
|
|
|
|
${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
|
|
|
|
|
${if (any (x: x != null) [c.dbpass c.dbpassFile])
|
|
|
|
|
then "--database-pass" else null} = dbpass;
|
|
|
|
|
"--database-pass" = dbpass;
|
|
|
|
|
${if c.dbtableprefix != null
|
|
|
|
|
then "--database-table-prefix" else null} = ''"${toString c.dbtableprefix}"'';
|
|
|
|
|
"--admin-user" = ''"${c.adminuser}"'';
|
|
|
|
|
@ -543,9 +534,9 @@ in {
|
|
|
|
|
|
|
|
|
|
services.nginx.enable = mkDefault true;
|
|
|
|
|
|
|
|
|
|
# FIXME(ma27) make sure that the config works fine with Nextcloud 19
|
|
|
|
|
# *and* Nextcloud 20 as soon as it gets released.
|
|
|
|
|
services.nginx.virtualHosts.${cfg.hostName} = {
|
|
|
|
|
services.nginx.virtualHosts.${cfg.hostName} = let
|
|
|
|
|
major = toInt (versions.major cfg.package.version);
|
|
|
|
|
in {
|
|
|
|
|
root = cfg.package;
|
|
|
|
|
locations = {
|
|
|
|
|
"= /robots.txt" = {
|
|
|
|
|
@ -558,7 +549,9 @@ in {
|
|
|
|
|
};
|
|
|
|
|
"/" = {
|
|
|
|
|
priority = 900;
|
|
|
|
|
extraConfig = "rewrite ^ /index.php;";
|
|
|
|
|
extraConfig = if major < 20
|
|
|
|
|
then "rewrite ^ /index.php;"
|
|
|
|
|
else "try_files $uri $uri/ /index.php$request_uri;";
|
|
|
|
|
};
|
|
|
|
|
"~ ^/store-apps" = {
|
|
|
|
|
priority = 201;
|
|
|
|
|
@ -582,7 +575,7 @@ in {
|
|
|
|
|
"~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = ''
|
|
|
|
|
return 404;
|
|
|
|
|
'';
|
|
|
|
|
"~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = {
|
|
|
|
|
${if major < 20 then "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" else "~ \\.php(?:$|/)"} = {
|
|
|
|
|
priority = 500;
|
|
|
|
|
extraConfig = ''
|
|
|
|
|
include ${config.services.nginx.package}/conf/fastcgi.conf;
|
|
|
|
|
|
Linus Heckemann