File tree Expand file tree Collapse file tree 5 files changed +21
-5
lines changed Expand file tree Collapse file tree 5 files changed +21
-5
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,6 @@ make install TARGET_DIR=%{_maindir} \
5050
5151mkdir -p %{buildroot }%{_localstatedir }/lib/rabbitmq/mnesia
5252mkdir -p %{buildroot }%{_localstatedir }/log/rabbitmq
53- mkdir -p %{buildroot }%{_localstatedir }/run/rabbitmq
5453
5554#Copy all necessary lib files etc.
5655install -p -D -m 0755 %{S:1 } %{buildroot }%{_initrddir }/rabbitmq-server
112111%defattr(-,root,root,-)
113112%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir }/lib/rabbitmq
114113%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir }/log/rabbitmq
115- %attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir }/run/rabbitmq
116114%dir %{_sysconfdir }/rabbitmq
117115%{_initrddir }/rabbitmq-server
118116%config(noreplace) %{_sysconfdir }/logrotate.d/rabbitmq-server
Original file line number Diff line number Diff line change @@ -34,12 +34,22 @@ test -x $CONTROL || exit 0
3434RETVAL=0
3535set -e
3636
37+ ensure_pid_dir () {
38+ PID_DIR=` dirname ${PID_FILE} `
39+ if [ ! -d ${PID_DIR} ] ; then
40+ mkdir -p ${PID_DIR}
41+ chown -R ${USER} :${USER} ${PID_DIR}
42+ chmod 755 ${PID_DIR}
43+ fi
44+ }
45+
3746start_rabbitmq () {
3847 status_rabbitmq quiet
3948 if [ $RETVAL = 0 ] ; then
4049 echo RabbitMQ is currently running
4150 else
4251 RETVAL=0
52+ ensure_pid_dir
4353 set +e
4454 setsid sh -c " RABBITMQ_PID_FILE=$PID_FILE $DAEMON > \
4555 ${INIT_LOG_DIR} /startup_log 2> ${INIT_LOG_DIR} /startup_err" &
Original file line number Diff line number Diff line change @@ -179,14 +179,24 @@ RABBITMQ_PID_FILE=$OCF_RESKEY_pid_file
179179[ ! -z $RABBITMQ_NODENAME ] && NODENAME_ARG=" -n $RABBITMQ_NODENAME "
180180[ ! -z $RABBITMQ_NODENAME ] && export RABBITMQ_NODENAME
181181
182+ ensure_pid_dir () {
183+ PID_DIR=` dirname ${RABBITMQ_PID_FILE} `
184+ if [ ! -d ${PID_DIR} ] ; then
185+ mkdir -p ${PID_DIR}
186+ chown -R rabbitmq:rabbitmq ${PID_DIR}
187+ chmod 755 ${PID_DIR}
188+ fi
189+ return $OCF_SUCCESS
190+ }
191+
182192export_vars () {
183193 [ ! -z $RABBITMQ_NODE_IP_ADDRESS ] && export RABBITMQ_NODE_IP_ADDRESS
184194 [ ! -z $RABBITMQ_NODE_PORT ] && export RABBITMQ_NODE_PORT
185195 [ ! -z $RABBITMQ_CONFIG_FILE ] && export RABBITMQ_CONFIG_FILE
186196 [ ! -z $RABBITMQ_LOG_BASE ] && export RABBITMQ_LOG_BASE
187197 [ ! -z $RABBITMQ_MNESIA_BASE ] && export RABBITMQ_MNESIA_BASE
188198 [ ! -z $RABBITMQ_SERVER_START_ARGS ] && export RABBITMQ_SERVER_START_ARGS
189- [ ! -z $RABBITMQ_PID_FILE ] && export RABBITMQ_PID_FILE
199+ [ ! -z $RABBITMQ_PID_FILE ] && ensure_pid_dir && export RABBITMQ_PID_FILE
190200}
191201
192202rabbit_validate_partial () {
Original file line number Diff line number Diff line change 44usr/share/man
55var/lib/rabbitmq/mnesia
66var/log/rabbitmq
7- var/run/rabbitmq
87etc/logrotate.d
98etc/rabbitmq
109
Original file line number Diff line number Diff line change 3232
3333chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
3434chown -R rabbitmq:rabbitmq /var/log/rabbitmq
35- chown -R rabbitmq:rabbitmq /var/run/rabbitmq
3635
3736case " $1 " in
3837 configure)
You can’t perform that action at this time.
0 commit comments