From 6b0bf828f78f58a998a5151e7bf1a2abf250463f Mon Sep 17 00:00:00 2001 From: rht Date: Sat, 5 Jan 2019 04:05:17 +0000 Subject: [PATCH] puppet: Add CentOS version of supervisord.conf path. --- puppet/zulip/manifests/supervisor.pp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/puppet/zulip/manifests/supervisor.pp b/puppet/zulip/manifests/supervisor.pp index b57b46e1f3..4f8976d2ee 100644 --- a/puppet/zulip/manifests/supervisor.pp +++ b/puppet/zulip/manifests/supervisor.pp @@ -3,6 +3,12 @@ class zulip::supervisor { 'supervisor', ] package { $supervisor_packages: ensure => 'installed' } + + $supervisord_conf = $::osfamily ? { + 'debian' => '/etc/supervisor/supervisord.conf', + 'redhat' => '/etc/supervisord.conf', + } + # In the dockervoyager environment, we don't want/need supervisor to be started/stopped # /bin/true is used as a decoy command, to maintain compatibility with other # code using the supervisor service. @@ -50,7 +56,7 @@ class zulip::supervisor { } } - file { '/etc/supervisor/supervisord.conf': + file { $supervisord_conf: ensure => file, require => Package[supervisor], owner => 'root',