apt: Add packagecloud repository for Debian.

puppet/zulip/manifests/apt_repository.pp

@@ -1,12 +1,24 @@
 # This depends on zulip::base having already been evaluated
 class zulip::apt_repository {
-  apt::source {'zulip':
-    location    => 'http://ppa.launchpad.net/tabbott/zulip/ubuntu',
-    release     => $zulip::base::release_name,
-    repos       => 'main',
-    key         => '84C2BE60E50E336456E4749CE84240474E26AE47',
-    key_source  => 'https://zulip.org/dist/keys/zulip-ppa.asc',
-    pin         => '995',
-    include_src => true,
+  if $zulip::base::release_name == "stretch" {
+    apt::source {'zulip':
+      location    =>  'https://packagecloud.io/zulip/server/debian/',
+      release     => $zulip::base::release_name,
+      repos       => 'main',
+      key         => 'E0847BF76A5F64D82ED0A038B97552F31FBFF74F',
+      key_source  => 'https://packagecloud.io/zulip/server/gpgkey',
+      pin         => '995',
+      include_src => false,
+    }
+  } else {
+    apt::source {'zulip':
+      location    => 'http://ppa.launchpad.net/tabbott/zulip/ubuntu',
+      release     => $zulip::base::release_name,
+      repos       => 'main',
+      key         => '84C2BE60E50E336456E4749CE84240474E26AE47',
+      key_source  => 'https://zulip.org/dist/keys/zulip-ppa.asc',
+      pin         => '995',
+      include_src => true,
+    }
   }
 }

scripts/lib/setup-apt-repo

@@ -21,8 +21,10 @@ deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
 deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main
 EOF
 elif [ "$release" = "stretch" ]; then
+    apt-key add "$SCRIPTS_PATH"/setup/packagecloud.asc
     apt-key add "$SCRIPTS_PATH"/setup/pgroonga-debian.asc
     cat >/etc/apt/sources.list.d/zulip.list <<EOF
+deb https://packagecloud.io/zulip/server/debian/ stretch main
 deb https://packages.groonga.org/debian/ stretch main
 deb-src https://packages.groonga.org/debian/ stretch main
 EOF

scripts/setup/packagecloud.asc

@@ -0,0 +1,64 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+=gvzA
+-----END PGP PUBLIC KEY BLOCK-----