From 69ea56c4e6026fa0766ec9e0764468d000974b59 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 27 Jul 2022 11:55:25 +0200 Subject: [PATCH] Fix install --- conf/discourse_defaults.conf | 7 +++++-- scripts/_common.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/conf/discourse_defaults.conf b/conf/discourse_defaults.conf index 9747b30..2585b9f 100644 --- a/conf/discourse_defaults.conf +++ b/conf/discourse_defaults.conf @@ -173,7 +173,7 @@ message_bus_redis_skip_client_commands = false enable_cors = false cors_origin = '' -# enable if you really need to serve assets in prd +# enable if you really need to serve assets in prod serve_static_assets = true # number of sidekiq workers (launched via unicorn master) @@ -210,7 +210,7 @@ secret_key_base = fallback_assets_path = # S3 settings used for serving ALL public files -# be sure to configre a CDN as well per cdn_url +# be sure to configure a CDN as well per cdn_url s3_bucket = s3_region = s3_access_key_id = @@ -239,6 +239,9 @@ max_reqs_per_ip_mode = block # bypass rate limiting any IP resolved as a private IP max_reqs_rate_limit_on_private = false +# use per user rate limits vs ip rate limits for users with this trust level or more. +skip_per_ip_rate_limit_trust_level = 1 + # logged in DoS protection # protection will only trigger for requests that queue longer than this amount diff --git a/scripts/_common.sh b/scripts/_common.sh index 955f96d..10d395d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ # dependencies used by the app #pkg_dependencies="g++ libjemalloc1|libjemalloc2 libjemalloc-dev zlib1g-dev libreadline-dev libpq-dev libssl-dev libyaml-dev libcurl4-dev libapr1-dev libxslt1-dev libxml2-dev vim imagemagick postgresql postgresql-server-dev-all postgresql-contrib optipng jhead jpegoptim gifsicle brotli" -pkg_dependencies="postgresql postgresql-client postgresql-contrib" +pkg_dependencies="postgresql postgresql-client postgresql-contrib imagemagick libjemalloc1|libjemalloc2" build_pkg_dependencies="libcurl4-openssl-dev libyaml-dev libxml2-dev libpq-dev libreadline-dev brotli libunwind-dev libtcmalloc-minimal4 cmake pngcrush pngquant advancecomp jhead jpegoptim libjpeg-turbo-progs optipng" ruby_version="2.7.6"