From b2c3f5e510e48c6ae9e0fbfcda0124cbf26eaa2e Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Wed, 9 Feb 2022 18:23:14 -0800
Subject: [PATCH] puppet: Include go version in go-camo release information.

---
 puppet/zulip/manifests/camo.pp   | 3 ++-
 puppet/zulip/manifests/common.pp | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/puppet/zulip/manifests/camo.pp b/puppet/zulip/manifests/camo.pp
index 2fcdf97cf9..a3e5297c6b 100644
--- a/puppet/zulip/manifests/camo.pp
+++ b/puppet/zulip/manifests/camo.pp
@@ -7,12 +7,13 @@ class zulip::camo (String $listen_address = '0.0.0.0') {
   }
 
   $version = $zulip::common::versions['go-camo']['version']
+  $goversion = $zulip::common::versions['go-camo']['goversion']
   $dir = "/srv/zulip-go-camo-${version}"
   $bin = "${dir}/bin/go-camo"
 
   zulip::external_dep { 'go-camo':
     version        => $version,
-    url            => "https://github.com/cactus/go-camo/releases/download/v${version}/go-camo-${version}.go1171.linux-${::architecture}.tar.gz",
+    url            => "https://github.com/cactus/go-camo/releases/download/v${version}/go-camo-${version}.go${goversion}.linux-${::architecture}.tar.gz",
     tarball_prefix => "go-camo-${version}",
   }
 
diff --git a/puppet/zulip/manifests/common.pp b/puppet/zulip/manifests/common.pp
index 473bd3cc13..41614833a6 100644
--- a/puppet/zulip/manifests/common.pp
+++ b/puppet/zulip/manifests/common.pp
@@ -41,8 +41,9 @@ class zulip::common {
   $versions = {
     # https://github.com/cactus/go-camo/releases
     'go-camo' => {
-      'version' => '2.3.0',
-      'sha256' => {
+      'version'   => '2.3.0',
+      'goversion' => '1171',
+      'sha256'    => {
         'amd64'   => '965506e6edb9d974c810519d71e847afb7ca69d1d01ae7d8be6d7a91de669c0c',
         'aarch64' => '40463f6790eb0d2da69ad6a902fcc4c6b0c0ac24106a6c28fbfce9dfa4cb15cd',
       },