summary refs log tree commit diff
path: root/nixos/modules/services/web-apps
diff options
context:
space:
mode:
authortalyz <kim.lindberger@gmail.com>2021-11-26 13:54:45 +0100
committertalyz <kim.lindberger@gmail.com>2021-12-02 10:31:00 +0100
commite2415dbb8f091ef8846a94f06ff72d075f0f912f (patch)
treefc685a8e705d1c9f2565b4ac2504144f969b26c7 /nixos/modules/services/web-apps
parent679398b160ccb36674b2b21ccf79896daf2d9f70 (diff)
downloadnixpkgs-e2415dbb8f091ef8846a94f06ff72d075f0f912f.tar
nixpkgs-e2415dbb8f091ef8846a94f06ff72d075f0f912f.tar.gz
nixpkgs-e2415dbb8f091ef8846a94f06ff72d075f0f912f.tar.bz2
nixpkgs-e2415dbb8f091ef8846a94f06ff72d075f0f912f.tar.lz
nixpkgs-e2415dbb8f091ef8846a94f06ff72d075f0f912f.tar.xz
nixpkgs-e2415dbb8f091ef8846a94f06ff72d075f0f912f.tar.zst
nixpkgs-e2415dbb8f091ef8846a94f06ff72d075f0f912f.zip
discourse: 2.7.9 -> 2.8.0.beta9
Update to the latest beta, since upstream advocates for it. See
https://github.com/NixOS/nixpkgs/issues/146308 for more info.
Diffstat (limited to 'nixos/modules/services/web-apps')
-rw-r--r--nixos/modules/services/web-apps/discourse.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix
index c4fb7e2b316..1c7ffd59a59 100644
--- a/nixos/modules/services/web-apps/discourse.nix
+++ b/nixos/modules/services/web-apps/discourse.nix
@@ -621,12 +621,13 @@ in
 
       max_user_api_reqs_per_minute = 20;
       max_user_api_reqs_per_day = 2880;
-      max_admin_api_reqs_per_key_per_minute = 60;
+      max_admin_api_reqs_per_minute = 60;
       max_reqs_per_ip_per_minute = 200;
       max_reqs_per_ip_per_10_seconds = 50;
       max_asset_reqs_per_ip_per_10_seconds = 200;
       max_reqs_per_ip_mode = "block";
       max_reqs_rate_limit_on_private = false;
+      skip_per_ip_rate_limit_trust_level = 1;
       force_anonymous_min_queue_seconds = 1;
       force_anonymous_min_per_10_seconds = 3;
       background_requests_max_queue_length = 0.5;
@@ -646,6 +647,9 @@ in
       enable_email_sync_demon = false;
       max_digests_enqueued_per_30_mins_per_site = 10000;
       cluster_name = null;
+      multisite_config_path = "config/multisite.yml";
+      enable_long_polling = null;
+      long_polling_interval = null;
     };
 
     services.redis.enable = lib.mkDefault (cfg.redis.host == "localhost");
@@ -825,7 +829,7 @@ in
 
       appendHttpConfig = ''
         # inactive means we keep stuff around for 1440m minutes regardless of last access (1 week)
-        # levels means it is a 2 deep heirarchy cause we can have lots of files
+        # levels means it is a 2 deep hierarchy cause we can have lots of files
         # max_size limits the size of the cache
         proxy_cache_path /var/cache/nginx inactive=1440m levels=1:2 keys_zone=discourse:10m max_size=600m;