community: Fix tests and workaround ohai issue on ARM Mac

[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..f3f58bb6e59c369bc156e6d854d9ef68e686a3fa 100644 (file)
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -21,7 +21,7 @@ links:
 
 # Workaround bug: https://github.com/discourse/discourse_docker/pull/505
 # params:
 
 # 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
+#  version: v2.8.13 - NOT USED HERE. UPDATE THE EXEC GIT ACTIONS BELOW WITH VERSION

 
 env:
   LC_ALL: en_US.UTF-8
 
 env:
   LC_ALL: en_US.UTF-8


@@ -32,7 +32,7 @@ env:
 
   ## 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
 
   ## 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: <%= [2, node.dig('cpu', 'total').to_i, node.dig('cpu', 'cores').to_i].max %>

 
   ## TODO: The domain name this Discourse instance will respond to
   DISCOURSE_HOSTNAME: community.openstreetmap.org
 
   ## TODO: The domain name this Discourse instance will respond to
   DISCOURSE_HOSTNAME: community.openstreetmap.org


@@ -97,8 +97,8 @@ hooks:
     - exec:
         cd: $home
         cmd:
     - exec:
         cd: $home
         cmd:

-          - git fetch --depth=1 origin tag v2.8.11 --no-tags
-          - git checkout v2.8.11
+          - git fetch --depth=1 origin tag v2.8.13 --no-tags
+          - git checkout v2.8.13

   after_ssl:
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"
   after_ssl:
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"