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

configure-rabbitmq: Factor out sudo, instead of rabbitmqctl.

This commit is contained in:
Alex Vandiver 2021-12-17 00:33:31 +00:00
parent bd7deed691
commit ece96c9729
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/setup/configure-rabbitmq
View File

@ -6,9 +6,9 @@ set -e
set -x set -x
if [ "$EUID" -eq 0 ]; then if [ "$EUID" -eq 0 ]; then
rabbitmqctl=(rabbitmqctl) sudo=()
else else
rabbitmqctl=(sudo rabbitmqctl) sudo=(sudo)
fi fi
RABBITMQ_USERNAME=$("$(dirname "$0")/../get-django-setting" RABBITMQ_USERNAME) RABBITMQ_USERNAME=$("$(dirname "$0")/../get-django-setting" RABBITMQ_USERNAME)
@ -17,7 +17,7 @@ RABBITMQ_PASSWORD=$("$(dirname "$0")/../get-django-setting" RABBITMQ_PASSWORD)
# Wait for RabbitMQ to start up # Wait for RabbitMQ to start up
try_ping() { try_ping() {
# `rabbitmqctl ping` requires 3.7.6 or newer # `rabbitmqctl ping` requires 3.7.6 or newer
out="$("${rabbitmqctl[@]}" eval 'net_adm:ping(node()).')" && [ "$out" = 'pong' ] out="$("${sudo[@]}" rabbitmqctl eval 'net_adm:ping(node()).')" && [ "$out" = 'pong' ]
} }
retries=29 retries=29
while ! try_ping 2>/dev/null; do while ! try_ping 2>/dev/null; do
@ -28,9 +28,9 @@ while ! try_ping 2>/dev/null; do
fi fi
done done
"${rabbitmqctl[@]}" delete_user "$RABBITMQ_USERNAME" || true "${sudo[@]}" rabbitmqctl delete_user "$RABBITMQ_USERNAME" || true
"${rabbitmqctl[@]}" delete_user zulip || true "${sudo[@]}" rabbitmqctl delete_user zulip || true
"${rabbitmqctl[@]}" delete_user guest || true "${sudo[@]}" rabbitmqctl delete_user guest || true
"${rabbitmqctl[@]}" add_user "$RABBITMQ_USERNAME" "$RABBITMQ_PASSWORD" "${sudo[@]}" rabbitmqctl add_user "$RABBITMQ_USERNAME" "$RABBITMQ_PASSWORD"
"${rabbitmqctl[@]}" set_user_tags "$RABBITMQ_USERNAME" administrator "${sudo[@]}" rabbitmqctl set_user_tags "$RABBITMQ_USERNAME" administrator
"${rabbitmqctl[@]}" set_permissions -p / "$RABBITMQ_USERNAME" '.*' '.*' '.*' "${sudo[@]}" rabbitmqctl set_permissions -p / "$RABBITMQ_USERNAME" '.*' '.*' '.*'