mirror of
https://github.com/zulip/docker-zulip.git
synced 2025-10-23 04:51:58 +00:00
Added modified supervisor puppet manifest
Removed TRAVIS env var
This commit is contained in:
@@ -16,7 +16,7 @@ RUN cp -rf /root/custom_zulip/* /root/zulip && \
|
||||
rm -rf /root/custom_zulip && \
|
||||
PUPPET_CLASSES="zulip::dockervoyager" DEPLOYMENT_TYPE="dockervoyager" \
|
||||
ADDITIONAL_PACKAGES="python-dev python-six python-pbs" VIRTUALENV_NEEDED="no" \
|
||||
TRAVIS="yes" /root/zulip/scripts/setup/install
|
||||
/root/zulip/scripts/setup/install
|
||||
|
||||
RUN cp -a /root/zulip/zproject/prod_settings_template.py /etc/zulip/settings.py && \
|
||||
ln -nsf /etc/zulip/settings.py /root/zulip/zproject/prod_settings.py && \
|
||||
|
23
custom_zulip_files/puppet/zulip/manifests/supervisor.pp
Normal file
23
custom_zulip_files/puppet/zulip/manifests/supervisor.pp
Normal file
@@ -0,0 +1,23 @@
|
||||
class zulip::supervisor {
|
||||
$supervisor_packages = [# Needed to run supervisor
|
||||
"supervisor",
|
||||
]
|
||||
package { $supervisor_packages: ensure => "installed" }
|
||||
|
||||
file { "/etc/supervisor/supervisord.conf":
|
||||
require => Package[supervisor],
|
||||
ensure => file,
|
||||
owner => "root",
|
||||
group => "root",
|
||||
mode => 644,
|
||||
source => "puppet:///modules/zulip/supervisor/supervisord.conf",
|
||||
}
|
||||
|
||||
if $zulip::base::release_name == "xenial" {
|
||||
exec {"enable supervisor":
|
||||
unless => "systemctl is-enabled supervisor",
|
||||
command => "systemctl enable supervisor",
|
||||
require => Package["supervisor"],
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user