mirror of
https://github.com/zulip/zulip.git
synced 2025-10-23 04:52:12 +00:00
puppet: Stop using an unnecessary concat.
This was added in 6975417acf
, to support `zmirror` deployments,
which are no longer necessary.
This commit is contained in:
committed by
Tim Abbott
parent
3188d9db31
commit
662c946635
@@ -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,
|
||||
|
Reference in New Issue
Block a user