summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2019-11-06 13:14:04 +0100
committerGitHub <noreply@github.com>2019-11-06 13:14:04 +0100
commitabe853b84c58ddbb7c5c07e80090d47480d56c11 (patch)
tree3669ddf9ec41d98625e5e679041ca10083494cc0 /nixos
parentf103882328e5e75e1dbefec3a9f098e0b358fd3e (diff)
parent22191298883e9be626d45d4d3948a9dd9999e4b2 (diff)
downloadnixpkgs-abe853b84c58ddbb7c5c07e80090d47480d56c11.tar
nixpkgs-abe853b84c58ddbb7c5c07e80090d47480d56c11.tar.gz
nixpkgs-abe853b84c58ddbb7c5c07e80090d47480d56c11.tar.bz2
nixpkgs-abe853b84c58ddbb7c5c07e80090d47480d56c11.tar.lz
nixpkgs-abe853b84c58ddbb7c5c07e80090d47480d56c11.tar.xz
nixpkgs-abe853b84c58ddbb7c5c07e80090d47480d56c11.tar.zst
nixpkgs-abe853b84c58ddbb7c5c07e80090d47480d56c11.zip
Merge pull request #70336 from abbradar/synapse-ipv6
matrix-synapse service: blacklist local IPv6 addresses by default
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/matrix-synapse.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 0f4eb2ccfca..50661b873f6 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -407,6 +407,9 @@ in {
           "192.168.0.0/16"
           "100.64.0.0/10"
           "169.254.0.0/16"
+          "::1/128"
+          "fe80::/64"
+          "fc00::/7"
         ];
         description = ''
           List of IP address CIDR ranges that the URL preview spider is denied