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 Aug 5, 2017
2 parents 8717b64 + 8955525 commit 9050b0f
Show file tree
Hide file tree
Showing 24 changed files with 453 additions and 566 deletions.
231 changes: 0 additions & 231 deletions addons/modsecurity.sh
View file

This file was deleted.

6 changes: 3 additions & 3 deletions addons/mysqladmin_shell.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,9 @@ case "$1" in
createuserdb
;;
createuserdb)
input_dbname=$1
input_dbuser=$2
input_dbpass=$3
input_dbname=$2
input_dbuser=$3
input_dbpass=$4
mysqlperm
createuserdb unattended $input_dbname $input_dbuser $input_dbpass
;;
Expand Down
2 changes: 2 additions & 0 deletions centmin.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ NGINX_HTTP2='y' # Nginx http/2 patch https://community.centminmod.c
NGINX_HTTPPUSH='n' # Nginx http/2 push patch https://community.centminmod.com/threads/11910/
NGINX_ZLIBNG='n' # 64bit OS only for Nginx compiled against zlib-ng https://github.com/Dead2/zlib-ng
NGINX_MODSECURITY='n' # modsecurity module support https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#Installation_for_NGINX
MODSECURITY_OWASPVER='3.0.2' # owasp modsecurity ruleset https://github.com/SpiderLabs/owasp-modsecurity-crs/releases
NGINX_REALIP='y' # http://nginx.org/en/docs/http/ngx_http_realip_module.html
NGINX_RDNS='n' # https://github.com/flant/nginx-http-rdns
NGINX_NJS='n' # nginScript https://www.nginx.com/blog/launching-nginscript-and-looking-ahead/
Expand Down Expand Up @@ -737,6 +738,7 @@ source "inc/openssl_install.inc"
source "inc/brotli.inc"
source "inc/nginx_patch.inc"
source "inc/fastopen.inc"
source "inc/mod_security.inc"
source "inc/nginx_configure.inc"
# source "inc/nginx_configure_openresty.inc"
source "inc/geoip.inc"
Expand Down
71 changes: 40 additions & 31 deletions inc/cpcheck.inc
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
libc_fix() {
# https://community.centminmod.com/posts/52555/
if [[ "$CENTOS_SEVEN" -eq '7' && ! -f /etc/yum/pluginconf.d/versionlock.conf && "$(rpm -qa libc-client)" = 'libc-client-2007f-4.el7.1.x86_64' ]]; then
if [[ "$CENTOS_SEVEN" -eq '7' && ! -f /etc/yum/pluginconf.d/versionlock.conf && "$(rpm -qa libc-client)" = 'libc-client-2007f-16.el7.x86_64' ]]; then
yum -y -q install yum-plugin-versionlock
yum versionlock libc-client -q >/dev/null 2>&1
elif [[ "$CENTOS_SEVEN" -eq '7' && ! -f /etc/yum/pluginconf.d/versionlock.conf && "$(rpm -qa libc-client)" != 'libc-client-2007f-4.el7.1.x86_64' ]]; then
yum versionlock libc-client uw-imap-devel -q >/dev/null 2>&1
elif [[ "$CENTOS_SEVEN" -eq '7' && ! -f /etc/yum/pluginconf.d/versionlock.conf && "$(rpm -qa libc-client)" != 'libc-client-2007f-16.el7.x86_64' ]]; then
INIT_DIR=$(echo $PWD)
cd /svr-setup
wget -q https://centminmod.com/centminmodparts/uw-imap/libc-client-2007f-4.el7.1.x86_64.rpm
wget -q https://centminmod.com/centminmodparts/uw-imap/uw-imap-devel-2007f-4.el7.1.x86_64.rpm
yum -y -q remove libc-client-2007f-14.el7.x86_64
yum -y -q localinstall libc-client-2007f-4.el7.1.x86_64.rpm uw-imap-devel-2007f-4.el7.1.x86_64.rpm
wget -q https://centminmod.com/centminmodparts/uw-imap/libc-client-2007f-16.el7.x86_64.rpm
wget -q https://centminmod.com/centminmodparts/uw-imap/uw-imap-devel-2007f-16.el7.x86_64.rpm
yum -y -q remove libc-client
yum -y -q localinstall libc-client-2007f-16.el7.x86_64.rpm uw-imap-devel-2007f-16.el7.x86_64.rpm
yum -y -q install yum-plugin-versionlock
yum versionlock libc-client uw-imap-devel -q >/dev/null 2>&1
cd "$INIT_DIR"
elif [[ "$CENTOS_SEVEN" -eq '7' && -f /etc/yum/pluginconf.d/versionlock.conf && "$(rpm -qa libc-client)" != 'libc-client-2007f-4.el7.1.x86_64' ]]; then
elif [[ "$CENTOS_SEVEN" -eq '7' && -f /etc/yum/pluginconf.d/versionlock.conf && "$(rpm -qa libc-client)" != 'libc-client-2007f-16.el7.x86_64' ]]; then
INIT_DIR=$(echo $PWD)
cd /svr-setup
wget -q https://centminmod.com/centminmodparts/uw-imap/libc-client-2007f-4.el7.1.x86_64.rpm
wget -q https://centminmod.com/centminmodparts/uw-imap/uw-imap-devel-2007f-4.el7.1.x86_64.rpm
yum -y -q remove libc-client-2007f-14.el7.x86_64
yum -y -q localinstall libc-client-2007f-4.el7.1.x86_64.rpm uw-imap-devel-2007f-4.el7.1.x86_64.rpm
yum -y -q install yum-plugin-versionlock
wget -q https://centminmod.com/centminmodparts/uw-imap/libc-client-2007f-16.el7.x86_64.rpm
wget -q https://centminmod.com/centminmodparts/uw-imap/uw-imap-devel-2007f-16.el7.x86_64.rpm
yum versionlock delete libc-client uw-imap-devel -q >/dev/null 2>&1
yum -y -q remove libc-client
yum -y -q localinstall libc-client-2007f-16.el7.x86_64.rpm uw-imap-devel-2007f-16.el7.x86_64.rpm
yum versionlock libc-client uw-imap-devel -q >/dev/null 2>&1
cd "$INIT_DIR"
fi
Expand Down Expand Up @@ -568,14 +568,19 @@ yumupdatechecker() {
return
}

if [[ -f /etc/yum.repos.d/remi.repo && -f /etc/yum.repos.d/city-fan.org.repo ]]; then
if [[ -f /etc/yum.repos.d/remi.repo && -f /etc/yum.repos.d/city-fan.org.repo ]] && [[ -f /usr/bin/php56 || -f /usr/bin/php70 || -f /usr/bin/php71 || -f /usr/bin/php72 ]]; then
YENABLEREPOS='remi,city-fan.org,remi-test'
YEXCLUDE='nginx* mysql*'
elif [[ -f /etc/yum.repos.d/remi.repo && -f /etc/yum.repos.d/city-fan.org.repo ]]; then
YENABLEREPOS='remi,city-fan.org'
YEXCLUDE='nginx* php* mysql*'
elif [ -f /etc/yum.repos.d/remi.repo ]; then
YENABLEREPOS='remi'
YEXCLUDE='nginx* php* mysql*'
else
YENABLEREPOS=""
YEXCLUDE='nginx* php* mysql*'
fi
YEXCLUDE='nginx* php* mysql*'
YYUM_PARAMETER='--disableplugin=priorities'
echo
echo " checking for YUM updates... please wait..."
Expand All @@ -596,22 +601,26 @@ yumupdatechecker() {
cecho "-------------------------------------------------------------" $boldgreen
cecho " To list available YUM Updates type: " $boldyellow
cecho "-------------------------------------------------------------" $boldgreen
if [[ -f /etc/yum.repos.d/remi.repo || -f /etc/yum.repos.d/city-fan.org.repo ]]; then
echo " yum list updates $YYUM_PARAMETER --enablerepo=$YENABLEREPOS"
else
echo " yum list updates $YYUM_PARAMETER"
fi
# cecho "-------------------------------------------------------------" $boldgreen
echo
cecho "-------------------------------------------------------------" $boldgreen
cecho " To update type: " $boldyellow
cecho "-------------------------------------------------------------" $boldgreen
if [[ -f /etc/yum.repos.d/remi.repo || -f /etc/yum.repos.d/city-fan.org.repo ]]; then
echo " yum update $YYUM_PARAMETER --enablerepo=$YENABLEREPOS"
else
echo " yum update $YYUM_PARAMETER"
fi
echo
if [[ -f /etc/yum.repos.d/remi.repo && -f /etc/yum.repos.d/city-fan.org.repo ]] && [[ -f /usr/bin/php56 || -f /usr/bin/php70 || -f /usr/bin/php71 || -f /usr/bin/php72 ]]; then
echo " yum list updates $YYUM_PARAMETER --enablerepo=$YENABLEREPOS --disableexcludes=main,remi"
elif [[ -f /etc/yum.repos.d/remi.repo || -f /etc/yum.repos.d/city-fan.org.repo ]]; then
echo " yum list updates $YYUM_PARAMETER --enablerepo=$YENABLEREPOS"
else
echo " yum list updates $YYUM_PARAMETER"
fi
# cecho "-------------------------------------------------------------" $boldgreen
echo
cecho "-------------------------------------------------------------" $boldgreen
cecho " To update type: " $boldyellow
cecho "-------------------------------------------------------------" $boldgreen
if [[ -f /etc/yum.repos.d/remi.repo && -f /etc/yum.repos.d/city-fan.org.repo ]] && [[ -f /usr/bin/php56 || -f /usr/bin/php70 || -f /usr/bin/php71 || -f /usr/bin/php72 ]]; then
echo " yum update $YYUM_PARAMETER --enablerepo=$YENABLEREPOS --disableexcludes=main,remi"
elif [[ -f /etc/yum.repos.d/remi.repo || -f /etc/yum.repos.d/city-fan.org.repo ]]; then
echo " yum update $YYUM_PARAMETER --enablerepo=$YENABLEREPOS"
else
echo " yum update $YYUM_PARAMETER"
fi
echo
else
echo " no YUM updates available"
fi
Expand Down
Loading

0 comments on commit 9050b0f

Please sign in to comment.