From 7853254df74d4e3c875d878566df69b9478b7674 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Mon, 30 Jul 2018 16:11:46 -0700
Subject: [PATCH] puppet: Run thumbor by default on voyager systems.

With this change, all that one needs to do to start using thumbor in
production is to set the `THUMBOR_URL` setting.

Since without THUMBOR_URL enabled, the thumbor service doesn't
actually do anything, this is pretty safe.
---
 puppet/zulip/manifests/dockervoyager.pp | 1 +
 puppet/zulip/manifests/voyager.pp       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/puppet/zulip/manifests/dockervoyager.pp b/puppet/zulip/manifests/dockervoyager.pp
index b10e67bf1b..f30bfbae9b 100644
--- a/puppet/zulip/manifests/dockervoyager.pp
+++ b/puppet/zulip/manifests/dockervoyager.pp
@@ -9,6 +9,7 @@ class zulip::dockervoyager {
   include zulip::app_frontend
   include zulip::supervisor
   include zulip::process_fts_updates
+  include zulip::thumbor
 
   file { '/etc/supervisor/conf.d/cron.conf':
     ensure  => file,
diff --git a/puppet/zulip/manifests/voyager.pp b/puppet/zulip/manifests/voyager.pp
index ad74dea535..4f6fb74ef1 100644
--- a/puppet/zulip/manifests/voyager.pp
+++ b/puppet/zulip/manifests/voyager.pp
@@ -19,4 +19,5 @@ class zulip::voyager {
   include zulip::redis
   include zulip::localhost_camo
   include zulip::static_asset_compiler
+  include zulip::thumbor
 }