Accepting request 174176 from network:messaging:amqp
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/174176 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rabbitmq-server?expand=0&rev=9
This commit is contained in:
commit
a21e045fea
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 24 12:25:15 UTC 2013 - tpaszkowski@novell.com
|
||||||
|
|
||||||
|
- fix rabbitmq-server startup on systemd enabled systems (create
|
||||||
|
/var/run/rabbitmq-server directory using systemd-tmpfiles mechanism)
|
||||||
|
|
||||||
------------------------------------------------------------------
|
------------------------------------------------------------------
|
||||||
Wed Apr 3 12:00:36 UTC 2013 - dmueller@suse.com
|
Wed Apr 3 12:00:36 UTC 2013 - dmueller@suse.com
|
||||||
|
|
||||||
|
@ -38,6 +38,7 @@ Source3: rabbitmq-server.logrotate
|
|||||||
Source4: rabbitmq-server.ocf
|
Source4: rabbitmq-server.ocf
|
||||||
Source5: rabbitmq-server.sysconfig
|
Source5: rabbitmq-server.sysconfig
|
||||||
Source6: rabbitmq-server.service
|
Source6: rabbitmq-server.service
|
||||||
|
Source7: rabbitmq-server.tmpfiles.d.conf
|
||||||
Patch0: no-nmap.patch
|
Patch0: no-nmap.patch
|
||||||
Patch1: no-remove-common.patch
|
Patch1: no-remove-common.patch
|
||||||
BuildRequires: erlang
|
BuildRequires: erlang
|
||||||
@ -147,6 +148,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq
|
|||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
|
mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
|
mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
|
||||||
|
|
||||||
|
# tmpfiles.d for systemd
|
||||||
|
%if 0%{?have_systemd}
|
||||||
|
mkdir -p %{buildroot}%/usr/lib/tmpfiles.d
|
||||||
|
install -p -D -m 0644 %{SOURCE7} %{buildroot}/usr/lib/tmpfiles.d/rabbitmq-server.conf
|
||||||
|
%endif
|
||||||
|
|
||||||
# Build the list of files
|
# Build the list of files
|
||||||
rm -f %{_builddir}/filelist.%{name}.rpm
|
rm -f %{_builddir}/filelist.%{name}.rpm
|
||||||
echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm
|
echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm
|
||||||
@ -173,6 +180,7 @@ exit 0
|
|||||||
%fillup_and_insserv rabbitmq-server
|
%fillup_and_insserv rabbitmq-server
|
||||||
%if 0%{?have_systemd}
|
%if 0%{?have_systemd}
|
||||||
%service_add_post %{name}.service
|
%service_add_post %{name}.service
|
||||||
|
systemd-tmpfiles --create --clean /usr/lib/tmpfiles.d/rabbitmq-server.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
@ -201,6 +209,7 @@ exit 0
|
|||||||
%{_sbindir}/rcrabbitmq-server
|
%{_sbindir}/rcrabbitmq-server
|
||||||
%if 0%{?have_systemd}
|
%if 0%{?have_systemd}
|
||||||
%{_unitdir}/%{name}.service
|
%{_unitdir}/%{name}.service
|
||||||
|
/usr/lib/tmpfiles.d/rabbitmq-server.conf
|
||||||
%endif
|
%endif
|
||||||
%dir /usr/lib/ocf
|
%dir /usr/lib/ocf
|
||||||
%dir /usr/lib/ocf/resource.d
|
%dir /usr/lib/ocf/resource.d
|
||||||
|
1
rabbitmq-server.tmpfiles.d.conf
Normal file
1
rabbitmq-server.tmpfiles.d.conf
Normal file
@ -0,0 +1 @@
|
|||||||
|
d /var/run/rabbitmq 0755 rabbitmq root - -
|
Loading…
Reference in New Issue
Block a user