bump up method cache

[discourse_docker.git] / templates / web.template.yml

diff --git a/templates/web.template.yml b/templates/web.template.yml
index bfd06ce637d0fc6fd6d6dd28aebbc37c8ff7302d..6c0f509760ab04e6eaf11865d01cf55599cac45a 100644 (file)
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -6,7 +6,9 @@ env:
   # slightly less aggressive than "recommendation" but works fine with oobgc
   RUBY_GC_MALLOC_LIMIT: 40000000
   # this ensures we have enough heap space to handle a big pile of small reqs
-  RUBY_HEAP_MIN_SLOTS: 800000
+  RUBY_GC_HEAP_INIT_SLOTS: 800000
+    # this gives us very good cache coverage, 96 -> 99
+  RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
 
   DISCOURSE_DB_SOCKET: /var/run/postgresql
   DISCOURSE_DB_HOST:
@@ -21,8 +23,25 @@ params:
   upload_size: 10m
 
 run:
+  # see: https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
+  - replace:
+      filename: /usr/local/etc/ImageMagick-6/policy.xml
+      from: "<policymap>"
+      to: |
+        <policymap>
+          <policy domain="coder" rights="none" pattern="EPHEMERAL" />
+          <policy domain="coder" rights="none" pattern="URL" />
+          <policy domain="coder" rights="none" pattern="HTTPS" />
+          <policy domain="coder" rights="none" pattern="MVG" />
+          <policy domain="coder" rights="none" pattern="MSL" />
+          <policy domain="coder" rights="none" pattern="TEXT" />
+          <policy domain="coder" rights="none" pattern="SHOW" />
+          <policy domain="coder" rights="none" pattern="WIN" />
+          <policy domain="coder" rights="none" pattern="PLT" />
+
   - exec: /usr/local/bin/ruby -e 'if ENV["DISCOURSE_SMTP_ADDRESS"] == "smtp.example.com"; puts "Aborting! Mail is not configured!"; exit 1; end'
   - exec: /usr/local/bin/ruby -e 'if ENV["DISCOURSE_HOSTNAME"] == "discourse.example.com"; puts "Aborting! Domain is not configured!"; exit 1; end'
+  - exec: chown -R discourse /home/discourse
   - file:
      path: /etc/runit/1.d/copy-env
      chmod: "+x"