X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0c78091245e5299e4856bf696edd9a5d44e3e4c7..8338ca56db576db8ec53f6f6fb3907e2ca370f75:/cookbooks/community/templates/default/web_only.yml.erb?ds=sidebyside diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb index b70599f59..14c3113c8 100644 --- 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: -# version: v2.8.4 +# version: v2.8.9 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 - UNICORN_WORKERS: 8 + UNICORN_WORKERS: <%= node[:cpu][:total] %> ## TODO: The domain name this Discourse instance will respond to DISCOURSE_HOSTNAME: community.openstreetmap.org @@ -65,7 +65,9 @@ env: ## The maxmind geolocation IP address key for IP address lookup ## see https://meta.discourse.org/t/-/137387/23 for details +<% if @license_keys -%> DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>' +<% end -%> volumes: - volume: @@ -97,8 +99,8 @@ hooks: - exec: cd: $home cmd: - - git fetch --depth=1 origin tag v2.8.4 --no-tags - - git checkout v2.8.4 + - git fetch --depth=1 origin tag v2.8.9 --no-tags + - git checkout v2.8.9 after_ssl: - replace: filename: "/etc/nginx/conf.d/discourse.conf"