From bd5e2ddc74beae554f64c5195d0a8d475f2ba41b Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Tue, 15 May 2018 15:28:26 -0700
Subject: [PATCH] puppet: Extract zulip::process_fts_updates.

In theory, one might want to run this either on the postgres server or
on an application server.
---
 puppet/zulip/manifests/postgres_appdb_base.pp | 22 +---------------
 puppet/zulip/manifests/process_fts_updates.pp | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 puppet/zulip/manifests/process_fts_updates.pp

diff --git a/puppet/zulip/manifests/postgres_appdb_base.pp b/puppet/zulip/manifests/postgres_appdb_base.pp
index abee4bf0f3..164f5d1f00 100644
--- a/puppet/zulip/manifests/postgres_appdb_base.pp
+++ b/puppet/zulip/manifests/postgres_appdb_base.pp
@@ -2,11 +2,9 @@
 class zulip::postgres_appdb_base {
   include zulip::postgres_common
   include zulip::supervisor
+  include zulip::process_fts_updates
 
   $appdb_packages = [
-    # Needed to run process_fts_updates
-    'python3-psycopg2', # TODO: use a virtualenv instead
-    'python-psycopg2', # TODO: use a virtualenv instead
     # Needed for our full text search system
     "postgresql-${zulip::base::postgres_version}-tsearch-extras",
   ]
@@ -17,24 +15,6 @@ class zulip::postgres_appdb_base {
     ensure => absent,
   }
 
-  file { '/usr/local/bin/process_fts_updates':
-    ensure => file,
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0755',
-    source => 'puppet:///modules/zulip/postgresql/process_fts_updates',
-  }
-
-  file { '/etc/supervisor/conf.d/zulip_db.conf':
-    ensure  => file,
-    require => Package[supervisor],
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    source  => 'puppet:///modules/zulip/supervisor/conf.d/zulip_db.conf',
-    notify  => Service[supervisor],
-  }
-
   file { "/usr/share/postgresql/${zulip::base::postgres_version}/tsearch_data/en_us.dict":
     ensure  => 'link',
     require => Package["postgresql-${zulip::base::postgres_version}"],
diff --git a/puppet/zulip/manifests/process_fts_updates.pp b/puppet/zulip/manifests/process_fts_updates.pp
new file mode 100644
index 0000000000..4fb22e63a7
--- /dev/null
+++ b/puppet/zulip/manifests/process_fts_updates.pp
@@ -0,0 +1,26 @@
+class zulip::process_fts_updates {
+  $fts_updates_packages = [
+    # Needed to run process_fts_updates
+    'python3-psycopg2', # TODO: use a virtualenv instead
+    'python-psycopg2', # TODO: use a virtualenv instead
+  ]
+  safepackage { $fts_updates_packages: ensure => 'installed' }
+
+  file { '/usr/local/bin/process_fts_updates':
+    ensure => file,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0755',
+    source => 'puppet:///modules/zulip/postgresql/process_fts_updates',
+  }
+
+  file { '/etc/supervisor/conf.d/zulip_db.conf':
+    ensure  => file,
+    require => Package[supervisor],
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    source  => 'puppet:///modules/zulip/supervisor/conf.d/zulip_db.conf',
+    notify  => Service[supervisor],
+  }
+}