|
 |
2a3055 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
2a3055 |
Date: Tue, 7 Jan 2020 00:19:51 +0300
|
|
|
2a3055 |
Subject: [PATCH] Revert "Use template in rabbitmq-script-wrapper for RabbitMQ
|
|
|
2a3055 |
user and group"
|
|
|
2a3055 |
|
|
|
2a3055 |
This reverts commit ad99cb2524ebc5750a13c3c12203390926f7b5cb.
|
|
|
2a3055 |
|
|
|
2a3055 |
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
|
|
|
2a3055 |
index e72e845..08568b1 100644
|
|
|
2a3055 |
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
|
|
|
2a3055 |
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
|
|
|
2a3055 |
@@ -42,8 +42,6 @@ RabbitMQ is an open source multi-protocol messaging broker.
|
|
|
2a3055 |
%define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
|
|
|
2a3055 |
%define _rabbit_server_ha_ocf scripts/rabbitmq-server-ha.ocf
|
|
|
2a3055 |
%define _rabbitmqctl_autocomplete scripts/rabbitmqctl-autocomplete.sh
|
|
|
2a3055 |
-%define _rabbitmq_user rabbitmq
|
|
|
2a3055 |
-%define _rabbitmq_group rabbitmq
|
|
|
2a3055 |
|
|
|
2a3055 |
|
|
|
2a3055 |
%define _maindir %{buildroot}%{_rabbit_erllibdir}
|
|
|
2a3055 |
@@ -84,7 +82,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq
|
|
|
2a3055 |
|
|
|
2a3055 |
mkdir -p %{buildroot}%{_sbindir}
|
|
|
2a3055 |
sed -e 's|@STDOUT_STDERR_REDIRECTION@||' \
|
|
|
2a3055 |
- -e 's|@RABBITMQ_USER@|%{_rabbitmq_user}|' -e 's|@RABBITMQ_GROUP@|%{_rabbitmq_group}|' \
|
|
|
2a3055 |
< scripts/rabbitmq-script-wrapper \
|
|
|
2a3055 |
> %{buildroot}%{_sbindir}/rabbitmqctl
|
|
|
2a3055 |
chmod 0755 %{buildroot}%{_sbindir}/rabbitmqctl
|
|
|
2a3055 |
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
|
|
|
2a3055 |
index 3cb4a2c..37df2cf 100755
|
|
|
2a3055 |
--- a/packaging/debs/Debian/debian/rules
|
|
|
2a3055 |
+++ b/packaging/debs/Debian/debian/rules
|
|
|
2a3055 |
@@ -5,8 +5,6 @@
|
|
|
2a3055 |
#export DH_VERBOSE=1
|
|
|
2a3055 |
|
|
|
2a3055 |
DEB_DESTDIR = debian/rabbitmq-server
|
|
|
2a3055 |
-RABBITMQ_USER ?= rabbitmq
|
|
|
2a3055 |
-RABBITMQ_GROUP ?= rabbitmq
|
|
|
2a3055 |
|
|
|
2a3055 |
unexport DEPS_DIR
|
|
|
2a3055 |
|
|
|
2a3055 |
@@ -34,7 +32,6 @@ override_dh_auto_install:
|
|
|
2a3055 |
$(MAKE) install-bin DESTDIR=$(DEB_DESTDIR)
|
|
|
2a3055 |
|
|
|
2a3055 |
sed -e 's|@STDOUT_STDERR_REDIRECTION@|> "$$RABBITMQ_LOG_BASE/startup_log" 2> "$$RABBITMQ_LOG_BASE/startup_err"|' \
|
|
|
2a3055 |
- -e 's|@RABBITMQ_USER@|$(RABBITMQ_USER)|' -e 's|@RABBITMQ_GROUP@|$(RABBITMQ_GROUP)|' \
|
|
|
2a3055 |
< scripts/rabbitmq-script-wrapper \
|
|
|
2a3055 |
> $(DEB_DESTDIR)$(PREFIX)/sbin/rabbitmqctl
|
|
|
2a3055 |
chmod 0755 $(DEB_DESTDIR)$(PREFIX)/sbin/rabbitmqctl
|
|
|
2a3055 |
diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper
|
|
|
2a3055 |
index ad023e7..d1cffb9 100644
|
|
|
2a3055 |
--- a/scripts/rabbitmq-script-wrapper
|
|
|
2a3055 |
+++ b/scripts/rabbitmq-script-wrapper
|
|
|
2a3055 |
@@ -45,7 +45,7 @@ maybe_fixup_erlang_cookie() {
|
|
|
2a3055 |
_erlang_cookie="$_rabbitmq_home/.erlang.cookie"
|
|
|
2a3055 |
if [ -f "$_erlang_cookie" ]
|
|
|
2a3055 |
then
|
|
|
2a3055 |
- chown @RABBITMQ_USER@:@RABBITMQ_GROUP@ "$_erlang_cookie"
|
|
|
2a3055 |
+ chown rabbitmq:rabbitmq "$_erlang_cookie"
|
|
|
2a3055 |
chmod 400 "$_erlang_cookie"
|
|
|
2a3055 |
fi
|
|
|
2a3055 |
}
|