diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-03-24 14:50:09 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-03-24 14:50:09 +0100 |
| commit | 4aa2aa0d8d975f1531289ae9e7b1f419f9a8a0b2 (patch) | |
| tree | c71f24b71197f15c52c0636f89d5b15ff39b2688 /packaging | |
| parent | af67b9554059568dcef1bd05224ba84324ec817b (diff) | |
| parent | 50506b399eee3e86d9577f4b3a6a58750a5cbcc5 (diff) | |
| download | rabbitmq-server-git-4aa2aa0d8d975f1531289ae9e7b1f419f9a8a0b2.tar.gz | |
Merge pull request #697 from bogdando/bug/1558627
Put the RabbitMQ OCF RA policy to /usr/sbin
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 3 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/rabbitmq-server.docs | 1 | ||||
| -rwxr-xr-x | packaging/debs/Debian/debian/rules | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index dc389f22b2..5996b553ae 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -26,7 +26,6 @@ RabbitMQ is an open source multi-protocol messaging 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} @@ -51,7 +50,6 @@ 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 @@ -125,6 +123,7 @@ done %doc LICENSE* %doc README %doc docs/rabbitmq.config.example +%doc docs/set_rabbitmq_policy.sh.example %clean rm -rf %{buildroot} diff --git a/packaging/debs/Debian/debian/rabbitmq-server.docs b/packaging/debs/Debian/debian/rabbitmq-server.docs index 40d4f2dc81..fbe9f95a05 100644 --- a/packaging/debs/Debian/debian/rabbitmq-server.docs +++ b/packaging/debs/Debian/debian/rabbitmq-server.docs @@ -1 +1,2 @@ docs/rabbitmq.config.example +docs/set_rabbitmq_policy.sh.example diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules index 669e30c177..053df18115 100755 --- a/packaging/debs/Debian/debian/rules +++ b/packaging/debs/Debian/debian/rules @@ -49,8 +49,6 @@ 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 |