From bdb1ce04a2ddd9e25ff6cdb027aa71ad006ed992 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Tue, 19 Jul 2016 17:26:50 -0700
Subject: [PATCH] puppet: Move pg_backup_and_purge to main config.

---
 .../files/postgresql/pg_backup_and_purge.py              | 0
 puppet/zulip/manifests/postgres_common.pp                | 9 +++++++++
 puppet/zulip_internal/manifests/postgres_common.pp       | 9 ---------
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename puppet/{zulip_internal => zulip}/files/postgresql/pg_backup_and_purge.py (100%)

diff --git a/puppet/zulip_internal/files/postgresql/pg_backup_and_purge.py b/puppet/zulip/files/postgresql/pg_backup_and_purge.py
similarity index 100%
rename from puppet/zulip_internal/files/postgresql/pg_backup_and_purge.py
rename to puppet/zulip/files/postgresql/pg_backup_and_purge.py
diff --git a/puppet/zulip/manifests/postgres_common.pp b/puppet/zulip/manifests/postgres_common.pp
index 4593e249aa..1d3355b18b 100644
--- a/puppet/zulip/manifests/postgres_common.pp
+++ b/puppet/zulip/manifests/postgres_common.pp
@@ -40,4 +40,13 @@ class zulip::postgres_common {
     mode => 750,
     source => "puppet:///modules/zulip/postgresql/env-wal-e",
   }
+
+  file { "/usr/local/bin/pg_backup_and_purge.py":
+    ensure => file,
+    owner => "root",
+    group => "postgres",
+    mode => 754,
+    source => "puppet:///modules/zulip/postgresql/pg_backup_and_purge.py",
+    require => File["/usr/local/bin/env-wal-e"],
+  }
 }
diff --git a/puppet/zulip_internal/manifests/postgres_common.pp b/puppet/zulip_internal/manifests/postgres_common.pp
index 4de3458351..814f44451b 100644
--- a/puppet/zulip_internal/manifests/postgres_common.pp
+++ b/puppet/zulip_internal/manifests/postgres_common.pp
@@ -16,15 +16,6 @@ class zulip_internal::postgres_common {
                         'python-gevent', 'lzop', 'pv'],
   }
 
-  file { "/usr/local/bin/pg_backup_and_purge.py":
-    ensure => file,
-    owner => "root",
-    group => "postgres",
-    mode => 754,
-    source => "puppet:///modules/zulip_internal/postgresql/pg_backup_and_purge.py",
-    require => File["/usr/local/bin/env-wal-e"],
-  }
-
   cron { "pg_backup_and_purge":
     command => "/usr/local/bin/pg_backup_and_purge.py",
     ensure => present,