diff --git a/oam/install_scripts/columnstoreSyslog7 b/oam/install_scripts/columnstoreSyslog7 index 0ed37f975..25e807eea 100644 --- a/oam/install_scripts/columnstoreSyslog7 +++ b/oam/install_scripts/columnstoreSyslog7 @@ -1,4 +1,6 @@ # MariaDB Columnstore Database Platform Logging +$FileGroup groupname +$FileOwner username local1.crit -/var/log/mariadb/columnstore/crit.log local1.err -/var/log/mariadb/columnstore/err.log local1.warning -/var/log/mariadb/columnstore/warning.log diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install index ea36b45d3..4b635bb55 100755 --- a/oam/install_scripts/post-install +++ b/oam/install_scripts/post-install @@ -4,7 +4,7 @@ # # Post-install steps for columnstore install -prefix=/usr/local +prefix=/home/quest installdir=$prefix/mariadb/columnstore rpmmode=install user=`whoami 2>/dev/null` @@ -125,7 +125,7 @@ test -d /var/log/mariadb || $SUDO mkdir /var/log/mariadb >/dev/null 2>&1 test -d /var/log/mariadb/columnstore || $SUDO mkdir /var/log/mariadb/columnstore >/dev/null 2>&1 if [ $user != "root" ]; then - $SUDO chmod -R 777 /var/log/mariadb >/dev/null 2>&1 + $SUDO chmod -R 755 /var/log/mariadb >/dev/null 2>&1 $SUDO chown -R $user:$user /var/log/mariadb >/dev/null 2>&1 fi @@ -164,10 +164,6 @@ chmod 755 /var/log/mariadb/columnstore/corefiles > /dev/null 2>&1 mkdir /mnt/tmp > /dev/null 2>&1 mkdir /var/log/mariadb/columnstore/data/archive > /dev/null 2>&1 -# install Columnstore Log Rotate File -$SUDO cp $installdir/bin/columnstoreLogRotate /etc/logrotate.d/columnstore > /dev/null 2>&1 -$SUDO chmod 644 /etc/logrotate.d/columnstore - # remove mysql archive log test -d $installdir/mysql/db || mkdir -p $installdir/mysql/db rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1 @@ -208,10 +204,20 @@ if [ $user = "root" ]; then fi fi #setup MariaDB Columnstore system logging +sed -i -e s/groupname/$user/g $installdir/bin/columnstoreSyslog7 +sed -i -e s/username/$user/g $installdir/bin/columnstoreSyslog7 + if [ $user = "root" ]; then $installdir/bin/syslogSetup.sh install > /tmp/syslog_install.log 2>&1 rm -f /etc/default/columnstore else + sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstore.def + sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstoreLogRotate + + $SUDO cp $installdir/bin/columnstore.def /etc/default/columnstore + + sed -i -e s@prefix=/home/quest@prefix=$prefix@g $installdir/bin/* + $SUDO rm -f /tmp/* > /dev/null 2>&1 $installdir/bin/syslogSetup.sh --installdir=$installdir install > /tmp/syslog_install.log 2>&1 $SUDO chown $user:$user $installdir/etc/Columnstore.xml @@ -219,14 +225,14 @@ else $SUDO mkdir /var/lock/subsys > /dev/null 2>&1 $SUDO chmod 777 /var/lock/subsys > /dev/null 2>&1 $SUDO rm -f /var/lock/subsys/mysql-Columnstore - $SUDO chmod 666 /etc/fstab + $SUDO chmod 644 /etc/fstab - sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstore.def - $SUDO cp $installdir/bin/columnstore.def /etc/default/columnstore - - sed -i -e s@prefix=/usr/local@prefix=$prefix@g $installdir/bin/* fi +# install Columnstore Log Rotate File +$SUDO cp $installdir/bin/columnstoreLogRotate /etc/logrotate.d/columnstore > /dev/null 2>&1 +$SUDO chmod 644 /etc/logrotate.d/columnstore + #check if MariaDB Columnstore system logging was setup cat /tmp/syslog_install.log | grep 'No System Logging' >/dev/null 2>&1 if [ $? -eq 0 ]; then