paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-24 08:33:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

puppet: Stop using an unnecessary concat.

Browse Source 
This was added in 6975417acf, to support `zmirror` deployments,
which are no longer necessary.
This commit is contained in:
Alex Vandiver
2025-08-29 14:49:54 +00:00
committed by Tim Abbott
parent 3188d9db31
commit 662c946635
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
puppet/zulip/manifests/supervisor.pp
View File

@@ -81,24 +81,15 @@ class zulip::supervisor {
} }
$file_descriptor_limit = zulipconf('application_server', 'service_file_descriptor_limit', 40000) $file_descriptor_limit = zulipconf('application_server', 'service_file_descriptor_limit', 40000)
concat { $zulip::common::supervisor_conf_file: file { $zulip::common::supervisor_conf_file:
ensure => 'present', ensure => file,
require => Package[supervisor], require => Package[supervisor],
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
content => template('zulip/supervisor/supervisord.conf.erb'),
notify => Exec['supervisor-restart'], 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': file { '/usr/local/bin/secret-env-wrapper':
ensure => file, ensure => file,