Update apps.conf and apache enable mpm worker

apps.conf

@@ -1,7 +1,7 @@
 # newest software version
 # Web
 nginx_version=1.9.9
-tengine_version=2.1.1
+tengine_version=2.1.2
 
 tomcat_7_version=7.0.67
 tomcat_8_version=8.0.30
@@ -17,7 +17,7 @@ mysql_5_7_version=5.7.10
 mysql_5_6_version=5.6.28
 mysql_5_5_version=5.5.47
 
-mariadb_10_1_version=10.1.9
+mariadb_10_1_version=10.1.10
 mariadb_10_0_version=10.0.23
 mariadb_5_5_version=5.5.47
 
@@ -62,7 +62,7 @@ memcached_pecl_version=2.2.0
 memcache_pecl_version=3.0.8
 
 # phpMyadmin
-phpMyAdmin_version=4.4.15.1
+phpMyAdmin_version=4.4.15.2
 
 # jemalloc
 jemalloc_version=4.0.4

config/nginx.conf

@@ -17,7 +17,7 @@ http {
     server_names_hash_bucket_size 128;
     client_header_buffer_size 32k;
     large_client_header_buffers 4 32k;
-    client_max_body_size 50m;
+    client_max_body_size 1024m;
     sendfile on;
     tcp_nopush on;
     keepalive_timeout 120;

config/nginx_apache.conf

@@ -17,7 +17,7 @@ http {
     server_names_hash_bucket_size 128;
     client_header_buffer_size 32k;
     large_client_header_buffers 4 32k;
-    client_max_body_size 50m;
+    client_max_body_size 1024m;
     sendfile on;
     tcp_nopush on;
     keepalive_timeout 120;

config/nginx_tomcat.conf

@@ -17,7 +17,7 @@ http {
     server_names_hash_bucket_size 128;
     client_header_buffer_size 32k;
     large_client_header_buffers 4 32k;
-    client_max_body_size 50m;
+    client_max_body_size 1024m;
     sendfile on;
     tcp_nopush on;
     keepalive_timeout 120;

include/apache-2.2.sh

@@ -19,7 +19,8 @@ id -u $run_user >/dev/null 2>&1
 tar xzf httpd-$apache_2_version.tar.gz
 cd httpd-$apache_2_version
 [ ! -d "$apache_install_dir" ] && mkdir -p $apache_install_dir
-./configure --prefix=$apache_install_dir --enable-headers --enable-deflate --enable-mime-magic --enable-so --enable-rewrite --enable-ssl --with-ssl --enable-expires --enable-static-support --enable-suexec --disable-userdir --with-included-apr --with-mpm=prefork --disable-userdir
+[ "$ZendGuardLoader_yn" == 'y' -o "$ionCube_yn" == 'y' ] && MPM=prefork || MPM=worker
+./configure --prefix=$apache_install_dir --enable-headers --enable-deflate --enable-mime-magic --enable-so --enable-rewrite --enable-ssl --with-ssl --enable-expires --enable-static-support --enable-suexec --disable-userdir --with-included-apr --with-mpm=$MPM --disable-userdir
 make && make install
 if [ -e "$apache_install_dir/conf/httpd.conf" ];then
     echo "${CSUCCESS}Apache install successfully! ${CEND}"

include/apache-2.4.sh

@@ -32,7 +32,8 @@ cd httpd-$apache_4_version
 [ ! -d "$apache_install_dir" ] && mkdir -p $apache_install_dir
 /bin/cp -R ../apr-$apr_version ./srclib/apr
 /bin/cp -R ../apr-util-$apr_util_version ./srclib/apr-util
-./configure --prefix=$apache_install_dir --enable-headers --enable-deflate --enable-mime-magic --enable-so --enable-rewrite --enable-ssl --with-ssl --enable-expires --enable-static-support --enable-suexec --disable-userdir --with-included-apr --with-mpm=prefork --disable-userdir
+[ "$ZendGuardLoader_yn" == 'y' -o "$ionCube_yn" == 'y' ] && MPM=prefork || MPM=worker
+./configure --prefix=$apache_install_dir --enable-headers --enable-deflate --enable-mime-magic --enable-so --enable-rewrite --enable-ssl --with-ssl --enable-expires --enable-static-support --enable-suexec --disable-userdir --with-included-apr --with-mpm=$MPM --disable-userdir
 make && make install
 if [ -e "$apache_install_dir/conf/httpd.conf" ];then
     echo "${CSUCCESS}Apache install successfully! ${CEND}"

include/check_os.sh

@@ -15,9 +15,11 @@ if [ -n "`grep 'Aliyun Linux release' /etc/issue`" -o -e /etc/redhat-release ];t
     [ -n "`grep ' 5\.' /etc/redhat-release`" -o -n "`grep 'Aliyun Linux release5' /etc/issue`" ] && CentOS_RHEL_version=5
 elif [ -n "`grep bian /etc/issue`" ];then
     OS=Debian
+    [ ! -e "`which lsb_release`" ] && apt-get -y install lsb-release 
     Debian_version=`lsb_release -sr | awk -F. '{print $1}'`
 elif [ -n "`grep Ubuntu /etc/issue`" ];then
     OS=Ubuntu
+    [ ! -e "`which lsb_release`" ] && apt-get -y install lsb-release 
     Ubuntu_version=`lsb_release -sr | awk -F. '{print $1}'`
 else
     echo "${CFAILURE}Does not support this OS, Please contact the author! ${CEND}"

include/init_CentOS.sh

@@ -135,6 +135,7 @@ else
 fi 
 
 if [ "$IPTABLES_STATUS" == 'no' ];then
+    [ -e '/etc/sysconfig/iptables' ] && /bin/mv /etc/sysconfig/iptables{,_bk} 
     cat > /etc/sysconfig/iptables << EOF
 # Firewall configuration written by system-config-securitylevel
 # Manual customization of this file is not recommended.
@@ -166,7 +167,7 @@ service sshd restart
 # install tmux
 if [ ! -e "`which tmux`" ];then
     cd src
-    src_url=http://downloads.sourceforge.net/project/levent/libevent/libevent-2.0/libevent-2.0.22-stable.tar.gz && Download_src 
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/libevent-2.0.22-stable.tar.gz && Download_src 
     src_url=http://mirrors.linuxeye.com/oneinstack/src/tmux-2.1.tar.gz && Download_src 
     tar xzf libevent-2.0.22-stable.tar.gz
     cd libevent-2.0.22-stable
@@ -180,7 +181,7 @@ if [ ! -e "`which tmux`" ];then
     make && make install
     cd ../../
 
-    if [ `getconf WORD_BIT` == 32 ] && [ `getconf LONG_BIT` == 64 ];then
+    if [ "$OS_BIT" == '64' ];then
         ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib64/libevent-2.0.so.5
     else
         ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib/libevent-2.0.so.5

include/init_Debian.sh

@@ -102,6 +102,7 @@ else
 fi
 
 if [ "$IPTABLES_STATUS" == 'no' ];then
+    [ -e '/etc/iptables.up.rules' ] && /bin/mv /etc/iptables.up.rules{,_bk} 
     cat > /etc/iptables.up.rules << EOF
 # Firewall configuration written by system-config-securitylevel
 # Manual customization of this file is not recommended.

include/init_Ubuntu.sh

@@ -120,6 +120,7 @@ else
 fi
 
 if [ "$IPTABLES_STATUS" == 'no' ];then
+    [ -e '/etc/iptables.up.rules' ] && /bin/mv /etc/iptables.up.rules{,_bk} 
     cat > /etc/iptables.up.rules << EOF
 # Firewall configuration written by system-config-securitylevel
 # Manual customization of this file is not recommended.

include/memcached.sh

@@ -49,8 +49,11 @@ cd $oneinstack_dir/src
 if [ -e "$php_install_dir/bin/phpize" ];then
     # php memcache extension
     if [ "`$php_install_dir/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1}'`" == '7' ];then
-        git clone https://github.com/websupport-sk/pecl-memcache.git
-        cd pecl-memcache
+        #git clone https://github.com/websupport-sk/pecl-memcache.git
+        #cd pecl-memcache
+        src_url=http://mirrors.linuxeye.com/oneinstack/src/pecl-memcache-php7.tgz && Download_src
+        tar xzf pecl-memcache-php7.tgz
+        cd pecl-memcache-php7
     else
         src_url=http://pecl.php.net/get/memcache-$memcache_pecl_version.tgz && Download_src
         tar xzf memcache-$memcache_pecl_version.tgz 
@@ -90,8 +93,11 @@ if [ -e "$php_install_dir/bin/phpize" ];then
     rm -rf libmemcached-$libmemcached_version
 
     if [ "`$php_install_dir/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1}'`" == '7' ];then
-        git clone -b php7 https://github.com/php-memcached-dev/php-memcached.git 
-        cd php-memcached 
+        #git clone -b php7 https://github.com/php-memcached-dev/php-memcached.git 
+        #cd php-memcached 
+        src_url=http://mirrors.linuxeye.com/oneinstack/src/php-memcached-php7.tgz && Download_src
+        tar xzf php-memcached-php7.tgz
+        cd php-memcached-php7
     else
         src_url=http://pecl.php.net/get/memcached-$memcached_pecl_version.tgz && Download_src
         tar xzf memcached-$memcached_pecl_version.tgz

include/php-5.3.sh

@@ -122,7 +122,7 @@ sed -i 's@^short_open_tag = Off@short_open_tag = On@' $php_install_dir/etc/php.i
 sed -i 's@^expose_php = On@expose_php = Off@' $php_install_dir/etc/php.ini
 sed -i 's@^request_order.*@request_order = "CGP"@' $php_install_dir/etc/php.ini
 sed -i 's@^;date.timezone.*@date.timezone = Asia/Shanghai@' $php_install_dir/etc/php.ini
-sed -i 's@^post_max_size.*@post_max_size = 50M@' $php_install_dir/etc/php.ini
+sed -i 's@^post_max_size.*@post_max_size = 100M@' $php_install_dir/etc/php.ini
 sed -i 's@^upload_max_filesize.*@upload_max_filesize = 50M@' $php_install_dir/etc/php.ini
 sed -i 's@^;upload_tmp_dir.*@upload_tmp_dir = /tmp@' $php_install_dir/etc/php.ini
 sed -i 's@^max_execution_time.*@max_execution_time = 5@' $php_install_dir/etc/php.ini

include/php-5.4.sh

@@ -119,7 +119,7 @@ sed -i 's@^short_open_tag = Off@short_open_tag = On@' $php_install_dir/etc/php.i
 sed -i 's@^expose_php = On@expose_php = Off@' $php_install_dir/etc/php.ini
 sed -i 's@^request_order.*@request_order = "CGP"@' $php_install_dir/etc/php.ini
 sed -i 's@^;date.timezone.*@date.timezone = Asia/Shanghai@' $php_install_dir/etc/php.ini
-sed -i 's@^post_max_size.*@post_max_size = 50M@' $php_install_dir/etc/php.ini
+sed -i 's@^post_max_size.*@post_max_size = 100M@' $php_install_dir/etc/php.ini
 sed -i 's@^upload_max_filesize.*@upload_max_filesize = 50M@' $php_install_dir/etc/php.ini
 sed -i 's@^;upload_tmp_dir.*@upload_tmp_dir = /tmp@' $php_install_dir/etc/php.ini
 sed -i 's@^max_execution_time.*@max_execution_time = 5@' $php_install_dir/etc/php.ini

include/php-5.5.sh

@@ -118,7 +118,7 @@ sed -i 's@^short_open_tag = Off@short_open_tag = On@' $php_install_dir/etc/php.i
 sed -i 's@^expose_php = On@expose_php = Off@' $php_install_dir/etc/php.ini
 sed -i 's@^request_order.*@request_order = "CGP"@' $php_install_dir/etc/php.ini
 sed -i 's@^;date.timezone.*@date.timezone = Asia/Shanghai@' $php_install_dir/etc/php.ini
-sed -i 's@^post_max_size.*@post_max_size = 50M@' $php_install_dir/etc/php.ini
+sed -i 's@^post_max_size.*@post_max_size = 100M@' $php_install_dir/etc/php.ini
 sed -i 's@^upload_max_filesize.*@upload_max_filesize = 50M@' $php_install_dir/etc/php.ini
 sed -i 's@^;upload_tmp_dir.*@upload_tmp_dir = /tmp@' $php_install_dir/etc/php.ini
 sed -i 's@^max_execution_time.*@max_execution_time = 5@' $php_install_dir/etc/php.ini

include/php-5.6.sh

@@ -119,7 +119,7 @@ sed -i 's@^short_open_tag = Off@short_open_tag = On@' $php_install_dir/etc/php.i
 sed -i 's@^expose_php = On@expose_php = Off@' $php_install_dir/etc/php.ini
 sed -i 's@^request_order.*@request_order = "CGP"@' $php_install_dir/etc/php.ini
 sed -i 's@^;date.timezone.*@date.timezone = Asia/Shanghai@' $php_install_dir/etc/php.ini
-sed -i 's@^post_max_size.*@post_max_size = 50M@' $php_install_dir/etc/php.ini
+sed -i 's@^post_max_size.*@post_max_size = 100M@' $php_install_dir/etc/php.ini
 sed -i 's@^upload_max_filesize.*@upload_max_filesize = 50M@' $php_install_dir/etc/php.ini
 sed -i 's@^;upload_tmp_dir.*@upload_tmp_dir = /tmp@' $php_install_dir/etc/php.ini
 sed -i 's@^max_execution_time.*@max_execution_time = 5@' $php_install_dir/etc/php.ini

include/php-7.sh

@@ -118,7 +118,7 @@ sed -i 's@^short_open_tag = Off@short_open_tag = On@' $php_install_dir/etc/php.i
 sed -i 's@^expose_php = On@expose_php = Off@' $php_install_dir/etc/php.ini
 sed -i 's@^request_order.*@request_order = "CGP"@' $php_install_dir/etc/php.ini
 sed -i 's@^;date.timezone.*@date.timezone = Asia/Shanghai@' $php_install_dir/etc/php.ini
-sed -i 's@^post_max_size.*@post_max_size = 50M@' $php_install_dir/etc/php.ini
+sed -i 's@^post_max_size.*@post_max_size = 100M@' $php_install_dir/etc/php.ini
 sed -i 's@^upload_max_filesize.*@upload_max_filesize = 50M@' $php_install_dir/etc/php.ini
 sed -i 's@^;upload_tmp_dir.*@upload_tmp_dir = /tmp@' $php_install_dir/etc/php.ini
 sed -i 's@^max_execution_time.*@max_execution_time = 600@' $php_install_dir/etc/php.ini

include/redis.sh

@@ -59,8 +59,11 @@ Install_php-redis() {
 cd $oneinstack_dir/src
 if [ -e "$php_install_dir/bin/phpize" ];then
     if [ "`$php_install_dir/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1}'`" == '7' ];then
-        git clone -b php7 https://github.com/phpredis/phpredis.git
-        cd phpredis
+        #git clone -b php7 https://github.com/phpredis/phpredis.git
+        #cd phpredis
+        src_url=http://mirrors.linuxeye.com/oneinstack/src/phpredis-php7.tgz && Download_src
+        tar xzf phpredis-php7.tgz
+        cd phpredis-php7
     else
         src_url=http://pecl.php.net/get/redis-$redis_pecl_version.tgz && Download_src
         tar xzf redis-$redis_pecl_version.tgz