diff --git a/puppet/zulip/manifests/voyager.pp b/puppet/zulip/manifests/voyager.pp index 3ffb6fae5c..21db065e88 100644 --- a/puppet/zulip/manifests/voyager.pp +++ b/puppet/zulip/manifests/voyager.pp @@ -5,11 +5,11 @@ class zulip::voyager { include zulip::redis apt::source {'zulip': - location => 'http://apt.zulip.com/enterprise', - release => 'precise', - repos => 'v1', - key => 'E5FB045CA79AA8FC25FDE9F3B4F81D07A529EF65', - key_source => 'https://zulip.com/dist/keys/enterprise.asc', + location => 'http://ppa.launchpad.net/tabbott/zulip/ubuntu', + release => 'trusty', + repos => 'main', + key => '84C2BE60E50E336456E4749CE84240474E26AE47', + key_source => 'https://zulip.com/dist/keys/zulip.asc', pin => '995', include_src => true, } diff --git a/scripts/lib/install b/scripts/lib/install index c6fe953716..6f85bc81c4 100755 --- a/scripts/lib/install +++ b/scripts/lib/install @@ -3,10 +3,11 @@ # Assumes we've already been untarred # First, install any updates from the apt repo that may be needed -wget -O /root/enterprise.asc https://zulip.com/dist/keys/enterprise.asc -apt-key add /root/enterprise.asc +wget -O /root/zulip-ppa.asc https://zulip.com/dist/keys/zulip-ppa.asc +apt-key add /root/zulip-ppa.asc cat >/etc/apt/sources.list.d/zulip.list <