fix packaging bits

7 files changed, 6 insertions, 27 deletions

diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile
index be37646234..c67d8fd6e1 100644
--- a/packaging/RPMS/Fedora/Makefile
+++ b/packaging/RPMS/Fedora/Makefile
@@ -2,7 +2,6 @@ TARBALL_DIR=../../../dist
 TARBALL=$(notdir $(wildcard $(TARBALL_DIR)/rabbitmq-server-[0-9.]*.tar.gz))
 COMMON_DIR=../../common
 VERSION=$(shell echo $(TARBALL) | sed -e 's:rabbitmq-server-\(.*\)\.tar\.gz:\1:g')
-PLUGINS_DIST_DIR=
 
 TOP_DIR=$(shell pwd)
 #Under debian we do not want to check build dependencies, since that
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 57174b239a..d86a85a778 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -55,7 +55,7 @@ mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
 install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server
 install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmqctl
 install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-server
-install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugin
+install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugins
 install -p -D -m 0755 %{_rabbit_server_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
 
 install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
@@ -86,7 +86,7 @@ if ! getent passwd rabbitmq >/dev/null; then
             -c "RabbitMQ messaging server"
 fi
 
-chown -R rabbitmq:rabbitmq %{_rabbit_erllibdir}/plugins/
+chmod -w %{_rabbit_erllibdir}/plugins/
 
 %post
 /sbin/chkconfig --add %{name}
@@ -94,16 +94,6 @@ if [ -f %{_sysconfdir}/rabbitmq/rabbitmq.conf ] && [ ! -f %{_sysconfdir}/rabbitm
     mv %{_sysconfdir}/rabbitmq/rabbitmq.conf %{_sysconfdir}/rabbitmq/rabbitmq-env.conf
 fi
 
-if [ $1 -gt 1 ]; then
-    # Upgrade - find the old enabled_plugins file, copy it to the new
-    # version and re-enable plugins
-    ENABLED_PLUGINS_FILE=find %{_rabbit_libdir} -name 'enabled_plugins'
-    if [ "x" != "x$ENABLED_PLUGINS_FILE" ]; then
-        cp $ENABLED_PLUGINS_FILE %{_maindir}/plugins/
-        rabbitmq-plugin enable
-    fi
-fi
-
 %preun
 if [ $1 = 0 ]; then
   #Complete uninstall
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index 1b2fdd9e20..38c81134a2 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -2,7 +2,6 @@ TARBALL_DIR=../../../dist
 TARBALL=$(notdir $(wildcard $(TARBALL_DIR)/rabbitmq-server-[0-9.]*.tar.gz))
 COMMON_DIR=../../common
 VERSION=$(shell echo $(TARBALL) | sed -e 's:rabbitmq-server-\(.*\)\.tar\.gz:\1:g')
-PLUGINS_DIST_DIR=
 
 DEBIAN_ORIG_TARBALL=$(shell echo $(TARBALL) |  sed -e 's:\(.*\)-\(.*\)\(\.tar\.gz\):\1_\2\.orig\3:g')
 UNPACKED_DIR=rabbitmq-server-$(VERSION)
diff --git a/packaging/debs/Debian/debian/postinst b/packaging/debs/Debian/debian/postinst
index 8e8523b3ae..90b2001ecf 100644
--- a/packaging/debs/Debian/debian/postinst
+++ b/packaging/debs/Debian/debian/postinst
@@ -32,7 +32,7 @@ fi
 
 chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
 chown -R rabbitmq:rabbitmq /var/log/rabbitmq
-chown -R rabbitmq:rabbitmq /usr/lib/rabbitmq/lib/rabbitmq_server-*/plugins/
+chmod -w rabbitmq:rabbitmq /usr/lib/rabbitmq/lib/rabbitmq_server-*/plugins/
 
 case "$1" in
     configure)
@@ -40,13 +40,6 @@ case "$1" in
            [ ! -f /etc/rabbitmq/rabbitmq-env.conf ]; then
             mv /etc/rabbitmq/rabbitmq.conf /etc/rabbitmq/rabbitmq-env.conf
         fi
-
-        ENABLED_PLUGINS_FILE="/usr/lib/rabbitmq/lib/rabbitmq_server-$2/plugins/enabled_plugins"
-        if [ -f "$ENABLED_PLUGINS_FILE" ]; then
-            RABBIT_LIB=$(ls -1td /usr/lib/rabbitmq/lib/rabbitmq_server-* | head -1)
-            cp $ENABLED_PLUGINS_FILE $RABBIT_LIB/plugins/
-            rabbitmq-plugin enable
-        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index ffb4461680..108b1ed512 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -14,7 +14,7 @@ DOCDIR=$(DEB_DESTDIR)usr/share/doc/rabbitmq-server/
 install/rabbitmq-server::
 	mkdir -p $(DOCDIR)
 	rm $(RABBIT_LIB)LICENSE* $(RABBIT_LIB)INSTALL*
-	for script in rabbitmqctl rabbitmq-server rabbitmq-plugin; do \
+	for script in rabbitmqctl rabbitmq-server rabbitmq-plugins; do \
 		install -p -D -m 0755 debian/rabbitmq-script-wrapper $(DEB_DESTDIR)usr/sbin/$$script; \
 	done
 	sed -e 's|@RABBIT_LIB@|/usr/lib/rabbitmq/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)|g' <debian/postrm.in >debian/postrm
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index 0f2a47b69a..b5c342aad7 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -2,7 +2,6 @@ VERSION=0.0.0
 SOURCE_DIR=rabbitmq-server-$(VERSION)
 TARGET_DIR=rabbitmq_server-$(VERSION)
 TARGET_TARBALL=rabbitmq-server-generic-unix-$(VERSION)
-PLUGINS_DIST_DIR=
 
 dist:
 	tar -zxf ../../dist/$(SOURCE_DIR).tar.gz
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 6abcafc543..8bf9122ff9 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -2,7 +2,6 @@ VERSION=0.0.0
 SOURCE_DIR=rabbitmq-server-$(VERSION)
 TARGET_DIR=rabbitmq_server-$(VERSION)
 TARGET_ZIP=rabbitmq-server-windows-$(VERSION)
-PLUGINS_DIST_DIR=
 
 dist:
 	tar -zxf ../../dist/$(SOURCE_DIR).tar.gz
@@ -11,7 +10,7 @@ dist:
 	mkdir $(SOURCE_DIR)/sbin
 	mv $(SOURCE_DIR)/scripts/rabbitmq-server.bat $(SOURCE_DIR)/sbin
 	mv $(SOURCE_DIR)/scripts/rabbitmq-service.bat $(SOURCE_DIR)/sbin
-	mv $(SOURCE_DIR)/scripts/rabbitmq-plugin.bat $(SOURCE_DIR)/sbin
+	mv $(SOURCE_DIR)/scripts/rabbitmq-plugins.bat $(SOURCE_DIR)/sbin
 	mv $(SOURCE_DIR)/scripts/rabbitmqctl.bat $(SOURCE_DIR)/sbin
 	rm -rf $(SOURCE_DIR)/scripts
 	rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile $(SOURCE_DIR)/*mk
@@ -23,7 +22,7 @@ dist:
 	mv $(SOURCE_DIR) $(TARGET_DIR)
 	mkdir -p $(TARGET_DIR)
 	mkdir -p $(TARGET_DIR)/plugins
-	echo Put your .ez plugin files in this directory > $(TARGET_DIR)/plugins/README.txt
+	echo "This directory is unused.  See the plugins-dist directory."> $(TARGET_DIR)/plugins/UNUSED-README-UNUSED.txt
 	mv $(TARGET_DIR)/plugins-src/README $(TARGET_DIR)/plugins-dist/README.txt
 	xmlto -o . xhtml-nochunks ../../docs/rabbitmq-service.xml
 	elinks -dump -no-references -no-numbering rabbitmq-service.html \