diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-03-24 00:29:04 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2016-03-24 00:29:04 +0300 |
| commit | 117a20bc2383d6ee841547468fb615f34e4916f5 (patch) | |
| tree | 3c3c3f43ec6506980334d0180cff8fa6a70e79e8 /packaging | |
| parent | a5a24d32733e80e0ab1b5383d17bb405bd58d743 (diff) | |
| parent | 2b9b292de4e2f31f49fc9b9e99396aa47c1c8d53 (diff) | |
| download | rabbitmq-server-git-117a20bc2383d6ee841547468fb615f34e4916f5.tar.gz | |
Merge pull request #575 from rabbitmq/rabbitmq-server-550
Support new configuration format
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/postinst | 2 | ||||
| -rw-r--r-- | packaging/windows-exe/rabbitmq_nsi.in | 14 |
3 files changed, 18 insertions, 0 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index dc389f22b2..d3d33aa985 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -95,6 +95,8 @@ fi /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 diff --git a/packaging/debs/Debian/debian/postinst b/packaging/debs/Debian/debian/postinst index c83881e6ba..2439612c42 100644 --- a/packaging/debs/Debian/debian/postinst +++ b/packaging/debs/Debian/debian/postinst @@ -40,6 +40,8 @@ case "$1" in 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 ;; diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in index e66d2a99ed..ae1585c372 100644 --- a/packaging/windows-exe/rabbitmq_nsi.in +++ b/packaging/windows-exe/rabbitmq_nsi.in @@ -137,6 +137,20 @@ Section "RabbitMQ Server (required)" Rabbit ; Set output path to the user's data directory SetOutPath $APPDATA\RabbitMQ + IfFileExists advanced.config 0 +2 + Goto config_written + IfFileExists rabbitmq.config 0 +3 + Rename rabbitmq.config advanced.config + Goto config_written + ClearErrors + FileOpen $0 advanced.config w + IfErrors config_written + FileWrite $0 "[]." + FileClose $0 + config_written: + + + ; ...And put the example config file there File "rabbitmq_server-%%VERSION%%\etc\rabbitmq.config.example" |