mirror of
https://github.com/zulip/zulip.git
synced 2025-11-06 15:03:34 +00:00
install: Fix RabbitMQ node name if RabbitMQ is not installed.
This indirectly causes the RabbitMQ node name for new Zulip installations to default to zulip@localhost, which would eliminate the persistent problems we have had Fixes #194, #465, #1375, #1751. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
committed by
Tim Abbott
parent
092fe4fecb
commit
78d6c3d7e9
@@ -36,7 +36,23 @@ fi
|
|||||||
mkdir -p /etc/zulip
|
mkdir -p /etc/zulip
|
||||||
(
|
(
|
||||||
echo -e "[machine]\npuppet_classes = $PUPPET_CLASSES\ndeploy_type = $DEPLOYMENT_TYPE";
|
echo -e "[machine]\npuppet_classes = $PUPPET_CLASSES\ndeploy_type = $DEPLOYMENT_TYPE";
|
||||||
if [ -n "$TRAVIS" ]; then
|
|
||||||
|
# Note: there are four dpkg-query outputs to consider:
|
||||||
|
#
|
||||||
|
# root@host# dpkg-query --showformat '${Status}\n' -W rabbitmq-server 2>/dev/null
|
||||||
|
# root@host# apt install rabbitmq-server
|
||||||
|
# root@host# dpkg-query --showformat '${Status}\n' -W rabbitmq-server 2>/dev/null
|
||||||
|
# install ok installed
|
||||||
|
# root@host# apt remove rabbitmq-server
|
||||||
|
# root@host# dpkg-query --showformat '${Status}\n' -W rabbitmq-server 2>/dev/null
|
||||||
|
# deinstall ok config-files
|
||||||
|
# root@host# apt purge rabbitmq-server
|
||||||
|
# root@host# dpkg-query --showformat '${Status}\n' -W rabbitmq-server 2>/dev/null
|
||||||
|
# unknown ok not-installed
|
||||||
|
#
|
||||||
|
# (There are more possibilities in the case of dpkg errors.) Here
|
||||||
|
# we are checking for either empty or not-installed.
|
||||||
|
if [ -n "$TRAVIS" ] || ! dpkg-query --showformat '${Status}\n' -W rabbitmq-server 2>/dev/null | grep -vq ' not-installed$'; then
|
||||||
echo -e "\n[rabbitmq]\nnodename = zulip@localhost"
|
echo -e "\n[rabbitmq]\nnodename = zulip@localhost"
|
||||||
fi
|
fi
|
||||||
) > /etc/zulip/zulip.conf
|
) > /etc/zulip/zulip.conf
|
||||||
|
|||||||
Reference in New Issue
Block a user