From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 7 Jan 2020 00:19:51 +0300
Subject: [PATCH] Revert "Use template in rabbitmq-script-wrapper for RabbitMQ
 user and group"

This reverts commit ad99cb2524ebc5750a13c3c12203390926f7b5cb.

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