diff options
| author | Bogdan Dobrelya <bdobrelia@mirantis.com> | 2015-12-10 13:32:21 +0100 |
|---|---|---|
| committer | Bogdan Dobrelya <bdobrelia@mirantis.com> | 2015-12-10 17:09:11 +0100 |
| commit | 550241932b1fda01ef2909e56c818d97ceec0452 (patch) | |
| tree | 83104c453a9dbeb8c1d199b8ff696b4431bd7232 /packaging/RPMS | |
| parent | 06389b4f4a33cb94464d7d72a23ac848c6809082 (diff) | |
| download | rabbitmq-server-git-550241932b1fda01ef2909e56c818d97ceec0452.tar.gz | |
Fix the set_rabbitmq_policy.sh usage
* Call it only if exists
* Address packaging:
- for stable branch, use packaging/common/ to contain the
set_rabbitmq_policy.sh and include it to the debian rules
and rpm spec
NOTE: for master branch landing please update as appropriate,
as it should be using ./scripts source!
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
Diffstat (limited to 'packaging/RPMS')
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index f8aa0b484c..9a2cb4fb6e 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -12,6 +12,7 @@ Source3: rabbitmq-server.logrotate Source4: rabbitmq-server.ocf Source5: README Source6: rabbitmq-server-ha.ocf +Source7: set_rabbitmq_policy.sh URL: http://www.rabbitmq.com/ BuildArch: noarch BuildRequires: erlang >= R13B-03, python-simplejson, xmlto, libxslt, gzip, sed, zip @@ -33,6 +34,7 @@ scalable implementation of an AMQP broker. %define _rabbit_server_ocf %{_builddir}/`basename %{S:4}` %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins %define _rabbit_server_ha_ocf %{_builddir}/`basename %{S:6}` +%define _set_rabbitmq_policy_sh %{_builddir}/`basename %{S:7}` %define _maindir %{buildroot}%{_rabbit_erllibdir} @@ -46,6 +48,7 @@ cp %{S:2} %{_rabbit_wrapper} cp %{S:4} %{_rabbit_server_ocf} cp %{S:5} %{_builddir}/rabbitmq-server-%{version}/README cp %{S:6} %{_rabbit_server_ha_ocf} +cp %{S:7} %{_set_rabbitmq_policy_sh} make %{?_smp_mflags} %install @@ -65,6 +68,7 @@ install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-server install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugins 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 0755 %{_set_rabbitmq_policy_sh} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/set_rabbitmq_policy.sh install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq @@ -105,7 +109,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 |