From 662c946635cbe9c8fefcad29fe86b59f1281fa17 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Fri, 29 Aug 2025 14:49:54 +0000 Subject: [PATCH] puppet: Stop using an unnecessary concat. This was added in 6975417acfa8, to support `zmirror` deployments, which are no longer necessary. --- puppet/zulip/manifests/supervisor.pp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/puppet/zulip/manifests/supervisor.pp b/puppet/zulip/manifests/supervisor.pp index a7f1bcd4d7..b480cbce17 100644 --- a/puppet/zulip/manifests/supervisor.pp +++ b/puppet/zulip/manifests/supervisor.pp @@ -81,24 +81,15 @@ class zulip::supervisor { } $file_descriptor_limit = zulipconf('application_server', 'service_file_descriptor_limit', 40000) - concat { $zulip::common::supervisor_conf_file: - ensure => 'present', + file { $zulip::common::supervisor_conf_file: + ensure => file, require => Package[supervisor], owner => 'root', group => 'root', mode => '0644', + content => template('zulip/supervisor/supervisord.conf.erb'), notify => Exec['supervisor-restart'], } - concat::fragment { '00-supervisor-top': - order => '01', - target => $zulip::common::supervisor_conf_file, - content => rstrip(template('zulip/supervisor/supervisord.conf.erb')), - } - concat::fragment { '99-supervisor-end': - order => '99', - target => $zulip::common::supervisor_conf_file, - content => "\n", - } file { '/usr/local/bin/secret-env-wrapper': ensure => file,