Skip to content

Commit

Permalink
fix some deprecated options
Browse files Browse the repository at this point in the history
  • Loading branch information
ibizaman authored and ibizaman committed Feb 8, 2024
1 parent 94943c1 commit 7d0276e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
18 changes: 13 additions & 5 deletions modules/services/nextcloud-server.nix
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ in
'';
};

defaultPhoneRegion = lib.mkOption {
type = lib.types.str;
description = ''
Two letters region defining default region.
'';
example = "US";
};

postgresSettings = lib.mkOption {
type = lib.types.nullOr (lib.types.attrsOf lib.types.str);
default = null;
Expand Down Expand Up @@ -478,9 +486,6 @@ in
dbtype = "pgsql";
adminuser = cfg.adminUser;
adminpassFile = toString cfg.adminPassFile;
# Not using dbpassFile as we're using socket authentication.
defaultPhoneRegion = "US";
trustedProxies = [ "127.0.0.1" ];
};
database.createLocally = true;

Expand All @@ -500,14 +505,17 @@ in
extraAppsEnable = true;
appstoreEnable = true;

extraOptions = let
settings = let
protocol = if !(isNull cfg.ssl) then "https" else "http";
in {
"default_phone_region" = cfg.defaultPhoneRegion;

"overwrite.cli.url" = "${protocol}://${fqdn}";
"overwritehost" = fqdnWithPort;
# 'trusted_domains' needed otherwise we get this issue https://help.nextcloud.com/t/the-polling-url-does-not-start-with-https-despite-the-login-url-started-with-https/137576/2
# TODO: could instead set extraTrustedDomains
"trusted_domains" = [ fqdn ];
"trusted_proxies" = [ "127.0.0.1" ];
# TODO: could instead set overwriteProtocol
"overwriteprotocol" = protocol; # Needed if behind a reverse_proxy
"overwritecondaddr" = ""; # We need to set it to empty otherwise overwriteprotocol does not work.
Expand Down Expand Up @@ -765,7 +773,7 @@ in
secretFile = "${cfg.dataDir}/config/secretFile";

# See all options at https://github.com/pulsejet/nextcloud-oidc-login
extraOptions = {
settings = {
allow_user_to_change_display_name = false;
lost_password_link = "disabled";
oidc_login_provider_url = ssoFqdnWithPort;
Expand Down
1 change: 1 addition & 0 deletions test/vm/nextcloud.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ in
subdomain = "n";
dataDir = "/var/lib/nextcloud";
tracing = null;
defaultPhoneRegion = "US";

# This option is only needed because we do not access Nextcloud at the default port in the VM.
externalFqdn = "n.example.com:8080";
Expand Down

0 comments on commit 7d0276e

Please sign in to comment.