community: force bump discourse version

[chef.git] / cookbooks / community / templates / default / web_only.yml.erb

diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index 3cda7c9fa39c53950516db8e34a9f66196901bb7..0f5ddd5775fb02aedac6128979d3d60b307a4f18 100644 (file)
--- 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.11 - 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: <%= node[:cpu][:total] %>
+  UNICORN_WORKERS: <%= node.cpu_cores %>
 
   ## TODO: The domain name this Discourse instance will respond to
   DISCOURSE_HOSTNAME: community.openstreetmap.org
@@ -92,13 +90,8 @@ hooks:
           - 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 https://github.com/discourse/discourse-prometheus.git && cd discourse-prometheus && git checkout 72fff206ba18ad5ca3112fed2f5f0ce6a17ca6f8
           - git clone --depth 1 https://github.com/discourse/discourse-translator.git
-    - exec:
-        cd: $home
-        cmd:
-          - git fetch --depth=1 origin tag v2.8.11 --no-tags
-          - git checkout v2.8.11
   after_ssl:
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"