Skip to content

Commit

Permalink
first set of fixes for CentOS 7 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
centminmod committed Jul 10, 2014
1 parent ae4393c commit 7cf8e3f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion centmin.sh
Expand Up @@ -279,7 +279,7 @@ MYSQL_INSTALL=n # Install official Oracle MySQL Server (MariaDB alt
SENDMAIL_INSTALL=n # Install Sendmail (and mailx) set to y and POSTFIX_INSTALL=n for sendmail
POSTFIX_INSTALL=y # Install Postfix (and mailx) set to n and SENDMAIL_INSTALL=y for sendmail
# Nginx
NGINX_VERSION='1.7.2' # Use this version of Nginx
NGINX_VERSION='1.7.3' # Use this version of Nginx
NGINXBACKUP='y'
NGINXDIR='/usr/local/nginx'
NGINXCONFDIR="${NGINXDIR}/conf"
Expand Down
15 changes: 8 additions & 7 deletions inc/mariadb_install.inc
Expand Up @@ -11,15 +11,16 @@ mariadb55install() {
echo "MariaDB 5.5 Repo setup..."
echo ""

CENTOSVER=`cat /etc/redhat-release | awk '{ print $3 }'`
# CENTOSVER=$(cat /etc/redhat-release | awk '{ print $3 }')

if [ "$CENTOSVER" == 'release' ]; then
CENTOSVER=`cat /etc/redhat-release | awk '{ print $4 }'`
fi
# if [ "$CENTOSVER" == 'release' ]; then
# CENTOSVER=$(cat /etc/redhat-release | awk '{ print $4 }' | cut -d . -f1,2)
# fi

if [ "$CENTOSVER" == 'Enterprise' ]; then
CENTOSVER=`cat /etc/redhat-release | awk '{ print $7 }'`
fi
# if [ "$CENTOSVER" == 'Enterprise' ]; then
# CENTOSVER=$(cat /etc/redhat-release | awk '{ print $7 }')
# OLS='y'
# fi

MARIADB55ARCH=`uname -m`

Expand Down
6 changes: 3 additions & 3 deletions inc/nginx_install.inc
Expand Up @@ -224,12 +224,12 @@ fi # check if custom open file descriptor limits already exist
sed -i "s/server_name localhost/server_name $HN/g" /usr/local/nginx/conf/conf.d/virtual.conf
echo ""

# only run for CentOS 6.x
if [[ "$CENTOS_SEVEN" != '7' ]]; then
## only run for CentOS 6.x
#if [[ "$CENTOS_SEVEN" != '7' ]]; then
cp $CUR_DIR/init/nginx /etc/init.d/nginx
chmod +x /etc/init.d/nginx
chkconfig --levels 235 nginx on
fi # CENTOS_SEVEN != 7
#fi # CENTOS_SEVEN != 7

if [ -f /usr/local/nginx/html/phpi.php ]; then
# Randomize phpi.php filename
Expand Down
1 change: 1 addition & 0 deletions inc/yuminstall.inc
Expand Up @@ -80,6 +80,7 @@ sed -i 's/"long|!"/"long|long_nums|l!"/g' /usr/bin/mytop
fi

yumcentossixdownload
yumcentossevendownload

axelsetup
} 2>&1 | tee ${CENTMINLOGDIR}/centminmod_yumtimes_${DT}.log
Expand Down

0 comments on commit 7cf8e3f

Please sign in to comment.