Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

puppet: Move supervisor conf file path into zulip::common. 

Move this config file alongside the rest of the distro-dependent
paths.
This commit is contained in:
Alex Vandiver 2020-06-29 18:58:01 +00:00 committed by Tim Abbott
parent 93401448b9
commit 6fdcb4aa17
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/zulip/manifests/common.pp
View File

@ -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: {

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

@ -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',