diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2009-02-04 18:36:50 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2009-02-04 18:36:50 +0000 |
| commit | 0246da1090a4457395aa1f448680197ed4465bef (patch) | |
| tree | 7f3cfe0c91374f1a987e60bab7a77f3197042684 | |
| parent | f0a7991ea9e4967306b99660d7ca41c1fd8e40eb (diff) | |
| download | rabbitmq-server-0246da1090a4457395aa1f448680197ed4465bef.tar.gz | |
Use %{_sysconfdir} to locate /etc.
Return 2 on usage error in init-script.
Use %attr to define proper permissions for the /var/lib/rabbitmq and /var/log/rabbitmq directories and use -c parameter instead of running additional usermod command in the spec file.
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 2 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/init.d | 2 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 16 |
3 files changed, 8 insertions, 12 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index f52dd43e..af73cc49 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -5,7 +5,7 @@ TARBALL=$(SOURCE_TARBALL_DIR)/rabbitmq-server-$(VERSION).tar.gz TOP_DIR=$(shell pwd) #Under debian we do not want to check build dependencies, since that #only checks build-dependencies using rpms, not debs -DEFINES=--define '_topdir $(TOP_DIR)' --define '_tmppath $(TOP_DIR)/tmp' +DEFINES=--define '_topdir $(TOP_DIR)' --define '_tmppath $(TOP_DIR)/tmp' --define '_sysconfdir /etc' ifndef RPM_OS RPM_OS=fedora diff --git a/packaging/RPMS/Fedora/init.d b/packaging/RPMS/Fedora/init.d index fbb5c8ad..9409b73c 100644 --- a/packaging/RPMS/Fedora/init.d +++ b/packaging/RPMS/Fedora/init.d @@ -128,7 +128,7 @@ case "$1" in ;; *) echo "Usage: $0 {start|stop|status|rotate-logs|restart|condrestart|try-restart|reload|force-reload}" >&2 - RETVAL=1 + RETVAL=2 ;; esac diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 69881fba..c636c820 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -58,8 +58,7 @@ install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmqctl install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-server install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-multi -mkdir -p %{buildroot}/etc/logrotate.d -install -m 0644 %{S:3} %{buildroot}/etc/logrotate.d/rabbitmq-server +install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL @@ -79,13 +78,10 @@ fi # create rabbitmq user if ! getent passwd rabbitmq >/dev/null; then - useradd -r -g rabbitmq --home /var/lib/rabbitmq rabbitmq - usermod -c "RabbitMQ messaging server" rabbitmq + useradd -r -g rabbitmq -d /var/lib/rabbitmq rabbitmq \ + -c "RabbitMQ messaging server" rabbitmq fi -chown -R rabbitmq:rabbitmq /var/lib/rabbitmq -chown -R rabbitmq:rabbitmq /var/log/rabbitmq - /sbin/chkconfig --add %{name} /sbin/service rabbitmq-server start @@ -101,12 +97,12 @@ fi %files -f ../filelist.%{name}.rpm %defattr(-,root,root,-) -%dir /var/lib/rabbitmq -%dir /var/log/rabbitmq +%attr(0750, rabbitmq, rabbitmq) %dir /var/lib/rabbitmq +%attr(0750, rabbitmq, rabbitmq) %dir /var/log/rabbitmq %{_rabbit_erllibdir} %{_rabbit_libdir} %{_initrddir}/rabbitmq-server -%config(noreplace) /etc/logrotate.d/rabbitmq-server +%config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server %doc LICENSE LICENSE-MPL-RabbitMQ INSTALL %clean |