From ccfc6fe7802d37770276662e13e42e9fa9297ac0 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Fri, 21 Aug 2015 19:10:05 +0300 Subject: [PATCH] Fix to MXS-317: https://mariadb.atlassian.net/browse/MXS-317 Log, lib, cache and run directories are created on start if they do not exist. The ownership of the directories is changed to maxscale and the permissions are set to 0755. --- etc/init.d/maxscale.in | 29 +++++++++++++++++++++++++++++ etc/ubuntu/init.d/maxscale.in | 30 ++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/etc/init.d/maxscale.in b/etc/init.d/maxscale.in index 38203dc11..2776d81e8 100755 --- a/etc/init.d/maxscale.in +++ b/etc/init.d/maxscale.in @@ -58,6 +58,35 @@ start() { CHECK_RET=$? [ $CHECK_RET -eq 0 ] && echo -n " found $my_check" && success && CHECK_RET=0 + if [ ! -d @MAXSCALE_VARDIR@/log/maxscale ] + then + mkdir -p @MAXSCALE_VARDIR@/log/maxscale + fi + + if [ ! -d @MAXSCALE_VARDIR@/cache/maxscale ] + then + mkdir -p @MAXSCALE_VARDIR@/cache/maxscale + fi + + if [ ! -d @MAXSCALE_VARDIR@/lib/maxscale ] + then + mkdir -p @MAXSCALE_VARDIR@/lib/maxscale + fi + + if [ ! -d @MAXSCALE_VARDIR@/run/maxscale ] + then + mkdir -p @MAXSCALE_VARDIR@/run/maxscale + fi + + chown maxscale:maxscale @MAXSCALE_VARDIR@/log/maxscale + chown maxscale:maxscale @MAXSCALE_VARDIR@/lib/maxscale + chown maxscale:maxscale @MAXSCALE_VARDIR@/cache/maxscale + chown maxscale:maxscale @MAXSCALE_VARDIR@/run/maxscale + chmod 0755 @MAXSCALE_VARDIR@/log/maxscale + chmod 0755 @MAXSCALE_VARDIR@/lib/maxscale + chmod 0755 @MAXSCALE_VARDIR@/cache/maxscale + chmod 0755 @MAXSCALE_VARDIR@/run/maxscale + daemon --pidfile $MAXSCALE_PIDFILE @CMAKE_INSTALL_PREFIX@/@MAXSCALE_BINDIR@/maxscale --user=maxscale >& /dev/null RETVAL=$? diff --git a/etc/ubuntu/init.d/maxscale.in b/etc/ubuntu/init.d/maxscale.in index d17cea4ca..c9ee71bd3 100755 --- a/etc/ubuntu/init.d/maxscale.in +++ b/etc/ubuntu/init.d/maxscale.in @@ -56,6 +56,36 @@ servicename=maxscale RETVAL=0 start() { + + if [ ! -d @MAXSCALE_VARDIR@/log/maxscale ] + then + mkdir -p @MAXSCALE_VARDIR@/log/maxscale + fi + + if [ ! -d @MAXSCALE_VARDIR@/cache/maxscale ] + then + mkdir -p @MAXSCALE_VARDIR@/cache/maxscale + fi + + if [ ! -d @MAXSCALE_VARDIR@/lib/maxscale ] + then + mkdir -p @MAXSCALE_VARDIR@/lib/maxscale + fi + + if [ ! -d @MAXSCALE_VARDIR@/run/maxscale ] + then + mkdir -p @MAXSCALE_VARDIR@/run/maxscale + fi + + chown maxscale:maxscale @MAXSCALE_VARDIR@/log/maxscale + chown maxscale:maxscale @MAXSCALE_VARDIR@/lib/maxscale + chown maxscale:maxscale @MAXSCALE_VARDIR@/cache/maxscale + chown maxscale:maxscale @MAXSCALE_VARDIR@/run/maxscale + chmod 0755 @MAXSCALE_VARDIR@/log/maxscale + chmod 0755 @MAXSCALE_VARDIR@/lib/maxscale + chmod 0755 @MAXSCALE_VARDIR@/cache/maxscale + chmod 0755 @MAXSCALE_VARDIR@/run/maxscale + log_daemon_msg "Starting MaxScale" start_daemon -p "$MAXSCALE_PIDFILE" "$DAEMON" "$DAEMON_OPTS" 2> /dev/null > /dev/null