community: upgrade discourse to v2.8.7

[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 fa4fcb924bceb799740f5c8f1dd1240ff7311f1c..5794e498d84e0ebf4af1b0453b5a2042880ccf2d 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:
-#  version: v2.8.1
+#  version: v2.8.7
 
 env:
   LC_ALL: en_US.UTF-8
@@ -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:
@@ -88,7 +90,6 @@ hooks:
     - exec:
         cd: $home/plugins
         cmd:
-          - git clone --depth 1 https://github.com/discourse/docker_manager.git
           - 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
@@ -98,8 +99,8 @@ hooks:
     - exec:
         cd: $home
         cmd:
-          - git fetch --depth=1 origin tag v2.8.2 --no-tags
-          - git checkout v2.8.2
+          - git fetch --depth=1 origin tag v2.8.7 --no-tags
+          - git checkout v2.8.7
   after_ssl:
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"