diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-08 09:36:00 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-08 09:36:00 -0500 |
commit | 6748534d83fa05cc6dee0f11bce543f7672b351f (patch) | |
tree | a0d303182dd9e0c8ae149316270b732715e9ae64 /nixos/modules/services/misc | |
parent | 4f7cdd35d58e3d32ba576e218316b3c835bc508c (diff) | |
parent | 3510b983c41196fce90729289c8c300ada1ccaea (diff) | |
download | nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.gz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.bz2 nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.lz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.xz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.zst nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'nixos/modules/services/misc')
-rw-r--r-- | nixos/modules/services/misc/matrix-synapse.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 7e880ad09b89..10901e102225 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -395,7 +395,14 @@ in { }; url_preview_ip_range_blacklist = mkOption { type = types.listOf types.str; - default = []; + default = [ + "127.0.0.0/8" + "10.0.0.0/8" + "172.16.0.0/12" + "192.168.0.0/16" + "100.64.0.0/10" + "169.254.0.0/16" + ]; description = '' List of IP address CIDR ranges that the URL preview spider is denied from accessing. @@ -412,14 +419,7 @@ in { }; url_preview_url_blacklist = mkOption { type = types.listOf types.str; - default = [ - "127.0.0.0/8" - "10.0.0.0/8" - "172.16.0.0/12" - "192.168.0.0/16" - "100.64.0.0/10" - "169.254.0.0/16" - ]; + default = []; description = '' Optional list of URL matches that the URL preview spider is denied from accessing. |