Skip to content

Commit

Permalink
Merge branch '123.09beta01'
Browse files Browse the repository at this point in the history
  • Loading branch information
@centminmod
centminmod committed Jan 19, 2017
2 parents 968fd80 + bc41e63 commit 9e21df3
Show file tree
Hide file tree
Showing 24 changed files with 135 additions and 43 deletions.
7 changes: 4 additions & 3 deletions centmin.sh
View file
Expand Up @@ -295,6 +295,7 @@ PHP_PGO='n' # Profile Guided Optimization https://software.int
PHP_PGO_CENTOSSIX='n' # CentOS 6 may need GCC >4.4.7 fpr PGO so use devtoolset-4 GCC 5.2
NGINX_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 even for CentOS 7 nginx compiles
GENERAL_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 whereever possible/coded
CRYPTO_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 for libressl or openssl compiles

# When set to =y, will disable those listed installed services
# by default. The service is still installed but disabled
Expand Down Expand Up @@ -523,7 +524,7 @@ PCRE_SOURCEINSTALL='n'
PCRE_VERSION='8.39' # PCRE version

# PHP and Cache/Acceleration
IMAGICKPHP_VER='3.4.3RC1' # PHP extension for imagick
IMAGICKPHP_VER='3.4.3RC2' # PHP extension for imagick
MAILPARSEPHP_VER='2.1.6' # https://pecl.php.net/package/mailparse
MAILPARSEPHP_COMPATVER='3.0.1' # For PHP 7
MEMCACHED_INSTALL='y' # Install Memcached
Expand All @@ -535,8 +536,8 @@ LIBMEMCACHED_YUM='y' # switch to YUM install instead of source compile
LIBMEMCACHED_VER='1.0.18' # libmemcached version for source compile
TWEMPERF_VER='0.1.1'
PHPREDIS='y' # redis PHP extension install
REDISPHP_VER='2.2.8' # redis PHP version for PHP <7.x
REDISPHPSEVEN_VER='3.0.0' # redis PHP version for PHP =>7.x
REDISPHP_VER='3.1.1RC2' # redis PHP version for PHP <7.x
REDISPHPSEVEN_VER='3.1.1RC2' # redis PHP version for PHP =>7.x
REDISPHP_GIT='n' # pull php 7 redis extension from git or pecl downloads
PHPMONGODB='n' # MongoDB PHP extension install
MONGODBPHP_VER='1.1.8' # MongoDB PHP version
Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb-4gb.cnf
View file
Expand Up @@ -63,7 +63,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# mariadb settings
userstat = 0
Expand Down Expand Up @@ -108,7 +108,7 @@ innodb_write_io_threads = 2

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb-min.cnf
View file
Expand Up @@ -63,7 +63,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# mariadb settings
userstat = 0
Expand Down Expand Up @@ -108,7 +108,7 @@ innodb_write_io_threads = 2

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb.cnf
View file
Expand Up @@ -63,7 +63,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# mariadb settings
userstat = 0
Expand Down Expand Up @@ -108,7 +108,7 @@ innodb_write_io_threads = 2

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb10-16gb.cnf
View file
Expand Up @@ -65,7 +65,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
innodb_large_prefix=1
Expand Down Expand Up @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb10-32gb.cnf
View file
Expand Up @@ -65,7 +65,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
innodb_large_prefix=1
Expand Down Expand Up @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb10-4gb.cnf
View file
Expand Up @@ -65,7 +65,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
innodb_large_prefix=1
Expand Down Expand Up @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb10-64gb-8c.cnf
View file
Expand Up @@ -65,7 +65,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
innodb_large_prefix=1
Expand Down Expand Up @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb10-64gb.cnf
View file
Expand Up @@ -65,7 +65,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
innodb_large_prefix=1
Expand Down Expand Up @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb10-8gb.cnf
View file
Expand Up @@ -65,7 +65,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
innodb_large_prefix=1
Expand Down Expand Up @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb10-min.cnf
View file
Expand Up @@ -65,7 +65,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
innodb_large_prefix=1
Expand Down Expand Up @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb10.cnf
View file
Expand Up @@ -65,7 +65,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
innodb_large_prefix=1
Expand Down Expand Up @@ -129,7 +129,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb55-4gb.cnf
View file
Expand Up @@ -63,7 +63,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
#innodb_extra_rsegments = 4
Expand Down Expand Up @@ -122,7 +122,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb55-min.cnf
View file
Expand Up @@ -63,7 +63,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
#innodb_extra_rsegments = 4
Expand Down Expand Up @@ -122,7 +122,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
4 changes: 2 additions & 2 deletions config/mysql/my-mdb55.cnf
View file
Expand Up @@ -63,7 +63,7 @@ log_warnings=1
slow_query_log=0
long_query_time=1
slow_query_log_file=/var/lib/mysql/slowq.log
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log

# innodb settings
#innodb_extra_rsegments = 4
Expand Down Expand Up @@ -122,7 +122,7 @@ log_slow_filter =admin,filesort,filesort_on_disk,full_join,full_scan,query_cache

[mysqld_safe]
socket=/var/lib/mysql/mysql.sock
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
#nice = -5
open-files-limit = 8192

Expand Down
2 changes: 1 addition & 1 deletion config/mysql/my.cnf
View file
Expand Up @@ -39,7 +39,7 @@ query_cache_type = 1
default-storage-engine = InnoDB

[mysqld_safe]
log-error=/var/log/mysqld.log
#log-error=/var/log/mysqld.log
pid-file=/var/run/mysqld/mysqld.pid
open-files-limit = 8192

Expand Down
7 changes: 4 additions & 3 deletions example/custom_config.inc
View file
Expand Up @@ -25,6 +25,7 @@ PHP_PGO='n' # Profile Guided Optimization https://software.int
PHP_PGO_CENTOSSIX='n' # CentOS 6 may need GCC >4.4.7 fpr PGO so use devtoolset-4 GCC 5.2
NGINX_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 even for CentOS 7 nginx compiles
GENERAL_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 whereever possible/coded
CRYPTO_DEVTOOLSETGCC='n' # Use devtoolset-4 GCC 5.2 for libressl or openssl compiles

# Nginx Dynamic Module Switches
NGXDYNAMIC_NJS='n'
Expand Down Expand Up @@ -210,7 +211,7 @@ PCRE_SOURCEINSTALL='n'
PCRE_VERSION='8.39' # PCRE version

# PHP and Cache/Acceleration
IMAGICKPHP_VER='3.4.3RC1' # PHP extension for imagick
IMAGICKPHP_VER='3.4.3RC2' # PHP extension for imagick
MAILPARSEPHP_VER='2.1.6' # https://pecl.php.net/package/mailparse
MAILPARSEPHP_COMPATVER='3.0.1' # For PHP 7
MEMCACHED_INSTALL='y' # Install Memcached
Expand All @@ -222,8 +223,8 @@ LIBMEMCACHED_YUM='y' # switch to YUM install instead of source compile
LIBMEMCACHED_VER='1.0.18' # libmemcached version for source compile
TWEMPERF_VER='0.1.1'
PHPREDIS='y' # redis PHP extension install
REDISPHP_VER='2.2.8' # redis PHP version
REDISPHPSEVEN_VER='3.0.0' # redis PHP version for PHP =>7.x
REDISPHP_VER='3.1.1RC2' # redis PHP version
REDISPHPSEVEN_VER='3.1.1RC2' # redis PHP version for PHP =>7.x
REDISPHP_GIT='n' # pull php 7 redis extension from git or pecl downloads
PHPMONGODB='n' # MongoDB PHP extension install
MONGODBPHP_VER='1.1.8' # MongoDB PHP version
Expand Down
21 changes: 18 additions & 3 deletions inc/cpcheck.inc
View file
Expand Up @@ -404,21 +404,36 @@ selinxcheck() {
yum -q -y install libselinux-utils
fi

if [[ -z $(sestatus | grep disabled) && -f /etc/selinux/config ]]; then
if [[ -z "$(sestatus | grep disabled)" && -f /etc/selinux/config ]]; then
echo "---------------------------------------------------------------"
echo "SELINUX linux detected"
echo "---------------------------------------------------------------"
echo "disabling SELINUX..."
echo "will require a server reboot before running initial install"
sleep 3
# sleep 3
sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config && setenforce 0
sed -i 's/SELINUX=permissive/SELINUX=disabled/g' /etc/selinux/config && setenforce 0
echo
echo "SELINUX disabled, please reboot server and rerun install"
echo "on reboot you can find the centmin.sh file located at:"
echo "echo $(pwd)"
echo "---------------------------------------------------------------"
exit 0
# exit 0
elif [[ -z "$(sestatus | grep disabled)" && -f /etc/sysconfig/selinux ]]; then
echo "---------------------------------------------------------------"
echo "SELINUX linux detected"
echo "---------------------------------------------------------------"
echo "disabling SELINUX..."
echo "will require a server reboot before running initial install"
# sleep 3
sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/sysconfig/selinux && setenforce 0
sed -i 's/SELINUX=permissive/SELINUX=disabled/g' /etc/sysconfig/selinux && setenforce 0
echo
echo "SELINUX disabled, please reboot server and rerun install"
echo "on reboot you can find the centmin.sh file located at:"
echo "echo $(pwd)"
echo "---------------------------------------------------------------"
# exit 0
fi
}

Expand Down
2 changes: 2 additions & 0 deletions inc/downloads_centosseven.inc
View file
Expand Up @@ -325,6 +325,7 @@ rpm -Uvh ${CENTOSSEVENPERCONALRELEASEFILE}

fi

if [[ "$(uname -m)" = 'x86_64' ]]; then
cd $DIR_TMP

if [ -s "${CENTOSSEVENVARNISHFILE}" ]; then
Expand Down Expand Up @@ -367,6 +368,7 @@ rpm --nosignature -i ${CENTOSSEVENVARNISHFILE}
fi

fi
fi # 64bit only

####
# axivo centos 6.x 64bit only
Expand Down
2 changes: 2 additions & 0 deletions inc/downloads_centossix.inc
View file
Expand Up @@ -325,6 +325,7 @@ rpm -Uvh ${CENTOSSIXPERCONALRELEASEFILE}

fi

if [[ "$(uname -m)" = 'x86_64' ]]; then
cd $DIR_TMP

if [ -s "${CENTOSSIXVARNISHFILE}" ]; then
Expand Down Expand Up @@ -366,6 +367,7 @@ rpm --nosignature -i ${CENTOSSIXVARNISHFILE}
fi

fi
fi # 64bit only

####
# axivo centos 6.x 64bit only
Expand Down

0 comments on commit 9e21df3

Please sign in to comment.