mirror of
https://github.com/zulip/zulip.git
synced 2025-11-01 20:44:04 +00:00
puppet: Rename zulip::profile::rabbit to ::rabbitmq.
This commit is contained in:
committed by
Tim Abbott
parent
188af57296
commit
5365af544a
@@ -1,14 +1,14 @@
|
||||
class zulip::profile::rabbit {
|
||||
class zulip::profile::rabbitmq {
|
||||
include zulip::profile::base
|
||||
$erlang = $::osfamily ? {
|
||||
'debian' => 'erlang-base',
|
||||
'redhat' => 'erlang',
|
||||
}
|
||||
$rabbit_packages = [# Needed to run RabbitMQ
|
||||
$erlang,
|
||||
'rabbitmq-server',
|
||||
]
|
||||
package { $rabbit_packages: ensure => 'installed' }
|
||||
$rabbitmq_packages = [
|
||||
$erlang,
|
||||
'rabbitmq-server',
|
||||
]
|
||||
package { $rabbitmq_packages: ensure => 'installed' }
|
||||
|
||||
# Removed 2020-09 in version 4.0; these lines can be removed in
|
||||
# Zulip version 5.0 and later.
|
||||
@@ -12,7 +12,7 @@ class zulip::profile::standalone {
|
||||
include zulip::profile::postgresql
|
||||
include zulip::profile::redis
|
||||
include zulip::profile::memcached
|
||||
include zulip::profile::rabbit
|
||||
include zulip::profile::rabbitmq
|
||||
if $::osfamily == debian {
|
||||
# camo is only required on Debian-based systems as part of
|
||||
# our migration towards not including camo at all.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# @summary Temporary shim for puppet profile
|
||||
class zulip::rabbit {
|
||||
include zulip::profile::rabbit
|
||||
include zulip::profile::rabbitmq
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
class zulip_ops::app_frontend {
|
||||
include zulip::app_frontend_base
|
||||
include zulip::profile::memcached
|
||||
include zulip::profile::rabbit
|
||||
include zulip::profile::rabbitmq
|
||||
include zulip::postfix_localmail
|
||||
include zulip::static_asset_compiler
|
||||
include zulip_ops::app_frontend_monitoring
|
||||
|
||||
@@ -480,7 +480,7 @@ EOF
|
||||
fi
|
||||
fi
|
||||
|
||||
if has_class "zulip::profile::rabbit"; then
|
||||
if has_class "zulip::profile::rabbitmq"; then
|
||||
if ! rabbitmqctl status >/dev/null; then
|
||||
set +x
|
||||
cat <<EOF
|
||||
|
||||
Reference in New Issue
Block a user