diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2015-12-14 20:06:53 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2015-12-14 20:06:53 +0300 |
| commit | 869640358a3e269704c0a6338f2014d9265a72c3 (patch) | |
| tree | f07bbc5965b6dcf9b5e20ee4dc838a2259e2e3dd /packaging | |
| parent | d90a5ead3dd848af51e2673e81c14bbb96b37c2b (diff) | |
| parent | de9f60af016198973ed163b1586b9838eb194228 (diff) | |
| download | rabbitmq-server-git-869640358a3e269704c0a6338f2014d9265a72c3.tar.gz | |
Merge branch 'master' into rabbitmq-server-255
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 4 | ||||
| -rwxr-xr-x | packaging/debs/Debian/debian/rules | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index a18c3d10a4..02a42c230f 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -28,6 +28,7 @@ scalable implementation of an AMQP broker. %define _rabbit_server_ocf scripts/rabbitmq-server.ocf %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins %define _rabbit_server_ha_ocf scripts/rabbitmq-server-ha.ocf +%define _set_rabbitmq_policy_sh scripts/set_rabbitmq_policy.sh %define _maindir %{buildroot}%{_rabbit_erllibdir} @@ -52,6 +53,7 @@ mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server install -p -D -m 0755 %{_rabbit_server_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server install -p -D -m 0755 %{_rabbit_server_ha_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha +install -p -D -m 0644 %{_set_rabbitmq_policy_sh} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/set_rabbitmq_policy.sh.example install -p -D -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq @@ -103,7 +105,7 @@ if [ $1 = 0 ]; then #Complete uninstall /sbin/service rabbitmq-server stop /sbin/chkconfig --del rabbitmq-server - + # We do not remove /var/log and /var/lib directories # Leave rabbitmq user and group fi diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules index 053df18115..669e30c177 100755 --- a/packaging/debs/Debian/debian/rules +++ b/packaging/debs/Debian/debian/rules @@ -49,6 +49,8 @@ override_dh_auto_install: $(DEB_DESTDIR)$(PREFIX)/lib/ocf/resource.d/rabbitmq/rabbitmq-server install -p -D -m 0755 scripts/rabbitmq-server-ha.ocf \ $(DEB_DESTDIR)$(PREFIX)/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha + install -p -D -m 0644 scripts/set_rabbitmq_policy.sh \ + $(DEB_DESTDIR)$(PREFIX)/lib/ocf/resource.d/rabbitmq/set_rabbitmq_policy.sh.example rm $(DEB_DESTDIR)$(RMQ_ERLAPP_DIR)/LICENSE* \ $(DEB_DESTDIR)$(RMQ_ERLAPP_DIR)/INSTALL |