From bf0fda742609d042aea35206e1623db6f547f70a Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Sun, 10 Nov 2013 09:53:17 -0500
Subject: [PATCH] Use the enterprise apt key when installing local server.

(imported from commit 24fa7474a77cac7b1d033c6732de6873d4aa9880)
---
 puppet/zulip/manifests/local_server.pp | 4 ++++
 scripts/setup/install                  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/puppet/zulip/manifests/local_server.pp b/puppet/zulip/manifests/local_server.pp
index 299d631bc6..b970e54f41 100644
--- a/puppet/zulip/manifests/local_server.pp
+++ b/puppet/zulip/manifests/local_server.pp
@@ -4,6 +4,10 @@ class zulip::local_server {
   include zulip::postgres_appdb
   include zulip::camo
 
+  apt::key {"A529EF65":
+    source  =>  "http://apt.zulip.com/enterprise.asc",
+  }
+
   file { "/etc/nginx/sites-available/zulip-local":
     require => Package[nginx],
     ensure => file,
diff --git a/scripts/setup/install b/scripts/setup/install
index 7661acd23c..18bf9f37b2 100755
--- a/scripts/setup/install
+++ b/scripts/setup/install
@@ -8,9 +8,12 @@ fi
 tarball="$1"
 
 # First, install any updates from the apt repo that may be needed
+wget -O /root/enterprise.asc https://apt.zulip.com/enterprise.asc
+apt-key add /root/enterprise.asc
 cat >/etc/apt/sources.list.d/zulip.list <<EOF
 deb http://apt.zulip.com/enterprise precise v1
 EOF
+
 apt-get update
 apt-get -y dist-upgrade
 apt-get install -y puppet git