From 138d7053b75affdd2ff2b5b2aee060ca43fd8add Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Fri, 8 Nov 2013 15:35:05 -0500
Subject: [PATCH] puppet: Move the wal-e dependencies to the internal postgres
 config.

(imported from commit 67251263ec98e5b141f4c7587042b4db7aed36f2)
---
 puppet/zulip/manifests/postgres_common.pp          | 4 ----
 puppet/zulip_internal/manifests/postgres_common.pp | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/puppet/zulip/manifests/postgres_common.pp b/puppet/zulip/manifests/postgres_common.pp
index c0ad0d43ff..8b0c67b710 100644
--- a/puppet/zulip/manifests/postgres_common.pp
+++ b/puppet/zulip/manifests/postgres_common.pp
@@ -8,10 +8,6 @@ class zulip::postgres_common {
                         "python-gevent",
                         "python-tz",
                         "python-dateutil",
-                        # dependencies for our wal-e backup system
-                        "python-boto",
-                        "lzop",
-                        "pv",
                         # our dictionary
                         "hunspell-en-us",
                         ]
diff --git a/puppet/zulip_internal/manifests/postgres_common.pp b/puppet/zulip_internal/manifests/postgres_common.pp
index 081b436464..8f48e68a77 100644
--- a/puppet/zulip_internal/manifests/postgres_common.pp
+++ b/puppet/zulip_internal/manifests/postgres_common.pp
@@ -1,6 +1,13 @@
 class zulip_internal::postgres_common {
   include zulip::postgres_common
 
+  $internal_postgres_packages = [# dependencies for our wal-e backup system
+                                 "python-boto",
+                                 "lzop",
+                                 "pv",
+                                 ]
+  package { $internal_postgres_packages: ensure => "installed" }
+
   exec {"pip_wal-e":
     command  => "/usr/bin/pip install git+git://github.com/zbenjamin/wal-e.git#egg=wal-e",
     creates  => "/usr/local/bin/wal-e",