X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e2516034fe6195242b3cbf966736149b92adb7a0..3dd9c1f272387bcb4da921f33e6d922db539e950:/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 50dcae4f8..551be5800 100644
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -65,6 +65,7 @@ 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_ACCOUNT_ID: '<%= node[:geoipupdate][:account] %>'
   DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>'
 <% end -%>
 
@@ -113,6 +114,11 @@ hooks:
         cd: $home
         cmd:
           - sudo -H -E -u discourse cp /shared/feeds/update-feeds.atom public/update-feeds.atom
+    - exec:
+        # FIXME: Workaround until https://github.com/discourse/discourse/pull/27040 merged
+        cd: $home
+        cmd:
+          - "sudo -H -E -u discourse sed -i 's/follow_redirect: false,/follow_redirect: true,/' lib/discourse_ip_info.rb"
   after_ssl:
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"