Merged 20327

3 files changed, 7 insertions, 0 deletions

diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index bedf8d816c..17daeadaae 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -68,6 +68,8 @@ install -p -D -m 0755 %SOURCE2 %{buildroot}%{_sbindir}/rabbitmq-multi
 mkdir -p %{buildroot}/etc/logrotate.d
 install -m 0644 %SOURCE3 %{buildroot}/etc/logrotate.d/rabbitmq-server
 
+mkdir -p %{buildroot}/etc/rabbitmq
+
 rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL
 
 #Build the list of files
@@ -110,6 +112,7 @@ fi
 %defattr(-,root,root,-)
 %dir /var/lib/rabbitmq
 %dir /var/log/rabbitmq
+%dir /etc/rabbitmq
 %{_rabbit_erllibdir}
 %{_rabbit_libdir}
 %{_initrddir}/rabbitmq-server
diff --git a/packaging/debs/Debian/debian/dirs b/packaging/debs/Debian/debian/dirs
index 1a707bc191..625b7d41f5 100644
--- a/packaging/debs/Debian/debian/dirs
+++ b/packaging/debs/Debian/debian/dirs
@@ -5,4 +5,5 @@ usr/share/man
 var/lib/rabbitmq/mnesia
 var/log/rabbitmq
 etc/logrotate.d
+etc/rabbitmq
 
diff --git a/packaging/debs/Debian/debian/postrm b/packaging/debs/Debian/debian/postrm
index 8d1e92a929..a999d95b29 100644
--- a/packaging/debs/Debian/debian/postrm
+++ b/packaging/debs/Debian/debian/postrm
@@ -31,6 +31,9 @@ case "$1" in
         if [ -d /var/run/rabbitmq ]; then
                 rm -r /var/run/rabbitmq
         fi
+        if [ -d /etc/rabbitmq ]; then
+                rm -r /etc/rabbitmq
+        fi
         if getent passwd rabbitmq >/dev/null; then
                 deluser rabbitmq
         fi