Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 526aec7ba7fd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e6e94417c76
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 11, 2020

  1. nixos/nextcloud: added trusted_proxies setting (#77480)

    @riotbib @Ma27
    riotbib authored and Ma27 committed Jan 11, 2020
    Copy the full SHA
    4e6e944 View commit details
Showing with 10 additions and 0 deletions.
  1. +10 −0 nixos/modules/services/web-apps/nextcloud.nix
10 changes: 10 additions & 0 deletions nixos/modules/services/web-apps/nextcloud.nix
View file
Original file line number Diff line number Diff line change
@@ -229,6 +229,15 @@ in {
'';
};

trustedProxies = mkOption {
type = types.listOf types.str;
default = [];
description = ''
Trusted proxies, to provide if the nextcloud installation is being
proxied to secure against e.g. spoofing.
'';
};

overwriteProtocol = mkOption {
type = types.nullOr (types.enum [ "http" "https" ]);
default = null;
@@ -352,6 +361,7 @@ in {
${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_pwd(),"}
'dbtype' => '${c.dbtype}',
'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)},
'trusted_proxies' => ${writePhpArrary (c.trustedProxies)},
];
'';
occInstallCmd = let