From 7c1853feab6f55874e8e2306f9870b2c44b10e5a Mon Sep 17 00:00:00 2001
From: David Hill <david.hill@mariadb.com>
Date: Wed, 21 Nov 2018 10:52:48 -0600
Subject: [PATCH] MCOL-1944 - move cplogger to syslogSetup.sh

---
 oam/install_scripts/syslogSetup.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/oam/install_scripts/syslogSetup.sh b/oam/install_scripts/syslogSetup.sh
index 22cf99054..7b088f522 100755
--- a/oam/install_scripts/syslogSetup.sh
+++ b/oam/install_scripts/syslogSetup.sh
@@ -183,12 +183,6 @@ makeDir() {
 		test -d /var/log/mariadb/columnstore/corefiles || mkdir /var/log/mariadb/columnstore/corefiles >/dev/null 2>&1
 		test -d /var/log/mariadb/columnstore/trace || mkdir /var/log/mariadb/columnstore/trace >/dev/null 2>&1
 	fi
-
-	if [ $non_root_user == "yes" ]; then
-		chmod 777 /var/log/mariadb
-		chmod 777 /var/log/mariadb/columnstore
-	fi
-
 }
 
 install() {
@@ -243,6 +237,9 @@ if [ ! -z "$syslog_conf" ] ; then
 	for CHMOD in "${CHMOD_LIST[@]}"; do
 		chmod $CHMOD /var/log/mariadb
 		chmod $CHMOD /var/log/mariadb/columnstore
+		chmod $CHMOD /var/log/mariadb/columnstore/archive
+		chmod $CHMOD /var/log/mariadb/columnstore/corefiles
+		chmod $CHMOD /var/log/mariadb/columnstore/trace
 
 		test -f $installdir/post/functions && . $installdir/post/functions
 		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib $installdir/bin/cplogger -i 19 "***** MariaDB Columnstore Installed *****"