Skip to content

Commit 291c28b

Browse files
author
Matthew Sackman
committed
The custom seems to be to ensure the directory is created on startup.
1 parent 0475dc4 commit 291c28b

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

packaging/RPMS/Fedora/rabbitmq-server.spec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ make install TARGET_DIR=%{_maindir} \
5050

5151
mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
5252
mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
53-
mkdir -p %{buildroot}%{_localstatedir}/run/rabbitmq
5453

5554
#Copy all necessary lib files etc.
5655
install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server
@@ -112,7 +111,6 @@ done
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

packaging/common/rabbitmq-server.init

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,22 @@ test -x $CONTROL || exit 0
3434
RETVAL=0
3535
set -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+
3746
start_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" &

packaging/common/rabbitmq-server.ocf

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff 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+
182192
export_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

192202
rabbit_validate_partial() {

packaging/debs/Debian/debian/dirs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ usr/sbin
44
usr/share/man
55
var/lib/rabbitmq/mnesia
66
var/log/rabbitmq
7-
var/run/rabbitmq
87
etc/logrotate.d
98
etc/rabbitmq
109

packaging/debs/Debian/debian/postinst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ fi
3232

3333
chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
3434
chown -R rabbitmq:rabbitmq /var/log/rabbitmq
35-
chown -R rabbitmq:rabbitmq /var/run/rabbitmq
3635

3736
case "$1" in
3837
configure)

0 commit comments

Comments
 (0)