From 6fdcb4aa176ae8d7cb3fe9603da3ad9e895821e0 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Mon, 29 Jun 2020 18:58:01 +0000
Subject: [PATCH] puppet: Move supervisor conf file path into zulip::common.

Move this config file alongside the rest of the distro-dependent
paths.
---
 puppet/zulip/manifests/common.pp     | 2 ++
 puppet/zulip/manifests/supervisor.pp | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/puppet/zulip/manifests/common.pp b/puppet/zulip/manifests/common.pp
index 672d4d92aa..62b19feced 100644
--- a/puppet/zulip/manifests/common.pp
+++ b/puppet/zulip/manifests/common.pp
@@ -6,6 +6,7 @@ class zulip::common {
       $nagios_plugins_dir = '/usr/lib/nagios/plugins'
       $nginx = 'nginx-full'
       $supervisor_conf_dir = '/etc/supervisor/conf.d'
+      $supervisor_conf_file = '/etc/supervisor/supervisord.conf'
       $supervisor_service = 'supervisor'
     }
     'redhat': {
@@ -13,6 +14,7 @@ class zulip::common {
       $nagios_plugins_dir = '/usr/lib64/nagios/plugins'
       $nginx = 'nginx'
       $supervisor_conf_dir = '/etc/supervisord.d/conf.d'
+      $supervisor_conf_file = '/etc/supervisord.conf'
       $supervisor_service = 'supervisord'
     }
     default: {
diff --git a/puppet/zulip/manifests/supervisor.pp b/puppet/zulip/manifests/supervisor.pp
index 8e0e33835a..36f0af930b 100644
--- a/puppet/zulip/manifests/supervisor.pp
+++ b/puppet/zulip/manifests/supervisor.pp
@@ -1,10 +1,6 @@
 class zulip::supervisor {
   package { 'supervisor': ensure => 'installed' }
 
-  $supervisord_conf = $::osfamily ? {
-    'debian' => '/etc/supervisor/supervisord.conf',
-    'redhat' => '/etc/supervisord.conf',
-  }
   # Command to start supervisor
   $supervisor_start = $::osfamily ? {
     'debian' => '/etc/init.d/supervisor start',
@@ -71,7 +67,7 @@ class zulip::supervisor {
     }
   }
 
-  file { $supervisord_conf:
+  file { $zulip::common::supervisor_conf_file:
     ensure  => file,
     require => Package[supervisor],
     owner   => 'root',