diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-12-14 16:10:45 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-12-14 16:10:45 +0100 |
| commit | 7cf0e51eda9cf40b3f01dc1649ce04471a9b37ea (patch) | |
| tree | c3a351f1633afe580380c16d18f8730ff38ed968 | |
| parent | f1caf10cb8af79b2620d9afdfd48f97591f0b75e (diff) | |
| parent | ef0a5c333524851c001bd401f3e624a726e2db81 (diff) | |
| download | rabbitmq-server-git-7cf0e51eda9cf40b3f01dc1649ce04471a9b37ea.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 4 | ||||
| -rwxr-xr-x | packaging/debs/Debian/debian/rules | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server-ha.ocf | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index a18c3d10a4..3d93f60e67 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 0755 %{_set_rabbitmq_policy_sh} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/set_rabbitmq_policy.sh 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..60ef6efa38 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 0755 scripts/set_rabbitmq_policy.sh \ + $(DEB_DESTDIR)$(PREFIX)/lib/ocf/resource.d/rabbitmq/set_rabbitmq_policy.sh rm $(DEB_DESTDIR)$(RMQ_ERLAPP_DIR)/LICENSE* \ $(DEB_DESTDIR)$(RMQ_ERLAPP_DIR)/INSTALL diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf index 376c661a45..76757b220c 100755 --- a/scripts/rabbitmq-server-ha.ocf +++ b/scripts/rabbitmq-server-ha.ocf @@ -1746,7 +1746,7 @@ action_promote() { fi local set_policy_path="$(dirname $0)/set_rabbitmq_policy.sh" - . $set_policy_path + [ -f $set_policy_path ] && . $set_policy_path # create timestamp file ocf_log info "${LH} Updating start timestamp" |