diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-14 23:59:31 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-14 23:59:31 +0000 |
| commit | 388bd5ecef704d7aa423878e28cf46820ba42aaa (patch) | |
| tree | f56964e1b059a3400259b2a6c9274f0bd58e5648 /nixpkgs/nixos/modules/services | |
| parent | a5e4eba0a2066e541c1e81938655cbf62067804e (diff) | |
| parent | 100012e55bc2a82fc680cba31a426ad38ead6fab (diff) | |
| download | nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.gz nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.bz2 nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.lz nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.xz nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.zst nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.zip | |
Merge commit '100012e55bc2a82fc680cba31a426ad38ead6fab'
Diffstat (limited to 'nixpkgs/nixos/modules/services')
| -rw-r--r-- | nixpkgs/nixos/modules/services/hardware/actkbd.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/nixos/modules/services/networking/nat.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/nixos/modules/services/web-apps/nextcloud.nix | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/nixpkgs/nixos/modules/services/hardware/actkbd.nix b/nixpkgs/nixos/modules/services/hardware/actkbd.nix index 4168140b287a..daa407ca1f0e 100644 --- a/nixpkgs/nixos/modules/services/hardware/actkbd.nix +++ b/nixpkgs/nixos/modules/services/hardware/actkbd.nix @@ -83,7 +83,7 @@ in See <command>actkbd</command> <filename>README</filename> for documentation. - The example shows a piece of what <option>sound.enableMediaKeys</option> does when enabled. + The example shows a piece of what <option>sound.mediaKeys.enable</option> does when enabled. ''; }; diff --git a/nixpkgs/nixos/modules/services/networking/nat.nix b/nixpkgs/nixos/modules/services/networking/nat.nix index f1238bc6b168..9c658af30f75 100644 --- a/nixpkgs/nixos/modules/services/networking/nat.nix +++ b/nixpkgs/nixos/modules/services/networking/nat.nix @@ -68,7 +68,7 @@ let destinationPorts = if (m == null) then throw "bad ip:ports `${fwd.destination}'" else elemAt m 1; in '' # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from the host itself - iptables -w -t nat -A OUTPUT \ + iptables -w -t nat -A nixos-nat-out \ -d ${loopbackip} -p ${fwd.proto} \ --dport ${builtins.toString fwd.sourcePort} \ -j DNAT --to-destination ${fwd.destination} diff --git a/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index f1dabadc119a..d79f2bb735fa 100644 --- a/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -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 |