Added modified supervisor puppet manifest

Removed TRAVIS env var
This commit is contained in:
Alexander Trost
2016-12-28 15:25:20 +01:00
parent 3bf709e2e5
commit e7d33b365e
2 changed files with 24 additions and 1 deletions

View File

@@ -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 && \

View 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"],
}
}
}