diff --git a/puppet/zulip/manifests/apt_repository.pp b/puppet/zulip/manifests/apt_repository.pp index 5cfed6f239..5c1bf04aee 100644 --- a/puppet/zulip/manifests/apt_repository.pp +++ b/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, + } } } diff --git a/scripts/lib/setup-apt-repo b/scripts/lib/setup-apt-repo index 2fff0e4754..60dbd78405 100755 --- a/scripts/lib/setup-apt-repo +++ b/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 <