X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1297de4eac0f30da215b909e653515be4e02b14b..7c110b4ca4633db65e1ed117ce20fc150ea68b0e:/cookbooks/community/templates/default/web_only.yml.erb?ds=inline

diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index f3f58bb6e..eb46dbe37 100644
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -1,6 +1,5 @@
 templates:
   - "templates/web.template.yml"
-  - "templates/web.ratelimited.template.yml"
   - "templates/web.ssl.template.yml"
 
 ## which TCP/IP ports should this container expose?
@@ -19,20 +18,19 @@ links:
 # any extra arguments for Docker?
 # docker_args:
 
-# Workaround bug: https://github.com/discourse/discourse_docker/pull/505
-# params:
-#  version: v2.8.13 - NOT USED HERE. UPDATE THE EXEC GIT ACTIONS BELOW WITH VERSION
+# Latest Version v3.0.1
+params:
+  version: stable
 
 env:
   LC_ALL: en_US.UTF-8
   LANG: en_US.UTF-8
   LANGUAGE: en_US.UTF-8
-  EMBER_CLI_PROD_ASSETS: 1
   DISCOURSE_FORCE_HTTPS: true
 
   ## How many concurrent web requests are supported? Depends on memory and CPU cores.
   ## will be set automatically by bootstrap based on detected CPUs, or you can override
-  UNICORN_WORKERS: <%= [2, node.dig('cpu', 'total').to_i, node.dig('cpu', 'cores').to_i].max %>
+  UNICORN_WORKERS: <%= node.cpu_cores %>
 
   ## TODO: The domain name this Discourse instance will respond to
   DISCOURSE_HOSTNAME: community.openstreetmap.org
@@ -67,6 +65,9 @@ env:
   DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>'
 <% end -%>
 
+  # Increase base SIDEKIQ memory limit to 1GB
+  UNICORN_SIDEKIQ_MAX_RSS: 1000
+
 volumes:
   - volume:
       host: /srv/community.openstreetmap.org/shared/web-only
@@ -80,6 +81,9 @@ volumes:
   - volume:
       host: /etc/ssl/private/community.openstreetmap.org.key
       guest: /shared/ssl/ssl.key
+  - volume:
+      host: /srv/community.openstreetmap.org/files/update-feeds.atom
+      guest: /var/www/discourse/public/update-feeds.atom
 
 ## Plugins go here
 ## see https://meta.discourse.org/t/19157 for details
@@ -88,17 +92,12 @@ hooks:
     - exec:
         cd: $home/plugins
         cmd:
-          - git clone --depth 1 https://github.com/discourse/discourse-oauth2-basic.git
-          - git clone --depth 1 https://github.com/discourse/discourse-solved.git
-          - git clone --depth 1 https://github.com/discourse/discourse-canned-replies.git
-          - git clone --depth 1 https://github.com/discourse/discourse-reactions.git
-          - git clone --depth 1 https://github.com/discourse/discourse-prometheus.git
-          - git clone --depth 1 https://github.com/discourse/discourse-translator.git
-    - exec:
-        cd: $home
-        cmd:
-          - git fetch --depth=1 origin tag v2.8.13 --no-tags
-          - git checkout v2.8.13
+          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-oauth2-basic.git
+          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-solved.git
+          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-canned-replies.git
+          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-reactions.git
+          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-prometheus.git
+          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-translator.git
   after_ssl:
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"