diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-04-26 12:11:40 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-04-26 12:11:40 +0200 |
| commit | ebac3c4cf22a6b0535236206eedf55b1d82c0eba (patch) | |
| tree | 18813538cf4e9dd86bcd2dac98627e4abb7872a1 | |
| parent | f84eeccc05ecaa30e8546314fea82c96be787ebe (diff) | |
| parent | 74cafa3c57ab1899314a811798e65e5d7416bcbc (diff) | |
| download | rabbitmq-server-git-ebac3c4cf22a6b0535236206eedf55b1d82c0eba.tar.gz | |
Merge pull request #765 from rabbitmq/rabbitmq-server-763
Do not move rabbitmq.conf to rabbitmq-env.conf during RPM and DEB install
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 5 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/postinst | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index b6715d430a..04676b0802 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -91,11 +91,6 @@ fi %post /sbin/chkconfig --add %{name} -if [ -f %{_sysconfdir}/rabbitmq/rabbitmq.conf ] && [ ! -f %{_sysconfdir}/rabbitmq/rabbitmq-env.conf ]; then - mv %{_sysconfdir}/rabbitmq/rabbitmq.conf %{_sysconfdir}/rabbitmq/rabbitmq-env.conf -else - touch %{_sysconfdir}/rabbitmq/rabbitmq-env.conf -fi chmod -R o-rwx,g-w %{_localstatedir}/lib/rabbitmq/mnesia %preun diff --git a/packaging/debs/Debian/debian/postinst b/packaging/debs/Debian/debian/postinst index 2439612c42..f49f2aa40f 100644 --- a/packaging/debs/Debian/debian/postinst +++ b/packaging/debs/Debian/debian/postinst @@ -37,12 +37,6 @@ chmod -R o-rwx,g-w /var/lib/rabbitmq/mnesia case "$1" in configure) - if [ -f /etc/rabbitmq/rabbitmq.conf ] && \ - [ ! -f /etc/rabbitmq/rabbitmq-env.conf ]; then - mv /etc/rabbitmq/rabbitmq.conf /etc/rabbitmq/rabbitmq-env.conf - else - touch /etc/rabbitmq/rabbitmq-env.conf - fi ;; abort-upgrade|abort-remove|abort-deconfigure) |