diff options
author | Kim Lindberger <kim.lindberger@gmail.com> | 2021-12-08 18:15:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-08 18:15:48 +0100 |
commit | 9bf94de535a54b4873f026dfe69d358dc02b0de5 (patch) | |
tree | f9c0210b1690b7a857ed461e6e39519fdbfcb00d /nixos/modules | |
parent | 52a2f435b1f33995d5bf4ae63ed6cf6fe149a6c0 (diff) | |
parent | 125bb7dac1fcf9829ff93a33ed19665a72872ecd (diff) | |
download | nixpkgs-9bf94de535a54b4873f026dfe69d358dc02b0de5.tar nixpkgs-9bf94de535a54b4873f026dfe69d358dc02b0de5.tar.gz nixpkgs-9bf94de535a54b4873f026dfe69d358dc02b0de5.tar.bz2 nixpkgs-9bf94de535a54b4873f026dfe69d358dc02b0de5.tar.lz nixpkgs-9bf94de535a54b4873f026dfe69d358dc02b0de5.tar.xz nixpkgs-9bf94de535a54b4873f026dfe69d358dc02b0de5.tar.zst nixpkgs-9bf94de535a54b4873f026dfe69d358dc02b0de5.zip |
Merge pull request #147506 from talyz/discourse-2.8.0.beta8
discourse: 2.7.9 -> 2.8.0.beta9
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/web-apps/discourse.nix | 16 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/discourse.xml | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index c4fb7e2b316..18b61200aa1 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; @@ -837,7 +841,7 @@ in inherit (cfg) sslCertificate sslCertificateKey enableACME; forceSSL = lib.mkDefault tlsEnabled; - root = "/run/discourse/public"; + root = "${cfg.package}/share/discourse/public"; locations = let @@ -889,7 +893,7 @@ in "~ ^/uploads/" = proxy { extraConfig = cache_1y + '' proxy_set_header X-Sendfile-Type X-Accel-Redirect; - proxy_set_header X-Accel-Mapping /run/discourse/public/=/downloads/; + proxy_set_header X-Accel-Mapping ${cfg.package}/share/discourse/public/=/downloads/; # custom CSS location ~ /stylesheet-cache/ { @@ -911,7 +915,7 @@ in "~ ^/admin/backups/" = proxy { extraConfig = '' proxy_set_header X-Sendfile-Type X-Accel-Redirect; - proxy_set_header X-Accel-Mapping /run/discourse/public/=/downloads/; + proxy_set_header X-Accel-Mapping ${cfg.package}/share/discourse/public/=/downloads/; ''; }; "~ ^/(svg-sprite/|letter_avatar/|letter_avatar_proxy/|user_avatar|highlight-js|stylesheets|theme-javascripts|favicon/proxied|service-worker)" = proxy { @@ -938,7 +942,7 @@ in }; "/downloads/".extraConfig = '' internal; - alias /run/discourse/public/; + alias ${cfg.package}/share/discourse/public/; ''; }; }; diff --git a/nixos/modules/services/web-apps/discourse.xml b/nixos/modules/services/web-apps/discourse.xml index 184c9c6363e..e91d3eac422 100644 --- a/nixos/modules/services/web-apps/discourse.xml +++ b/nixos/modules/services/web-apps/discourse.xml @@ -297,7 +297,7 @@ services.discourse = { the script: <programlisting language="bash"> ./update.py update-plugins -</programlisting>. +</programlisting> </para> <para> |