Update php 7.0.0alpha1 to 7.0.0alpha2

apps.conf

@@ -21,7 +21,7 @@ php_3_version=5.3.29
 php_4_version=5.4.42
 php_5_version=5.5.26
 php_6_version=5.6.10
-php_7_version=7.0.0alpha1
+php_7_version=7.0.0alpha2
 
 zendopcache_version=7.0.5
 xcache_version=3.2.0

backup.sh

@@ -41,7 +41,7 @@ WEB_Remote_BK() {
         for W in `echo $website_name | tr ',' ' '`
         do
 		cd $oneinstack_dir/tools
-                echo "file:::$home_dir/$W $backup_dir push" >> $oneinstack_dir/tools/config.txt
+                echo "file:::$wwwroot_dir/$W $backup_dir push" >> $oneinstack_dir/tools/config.txt
         done
 }
 

backup_setup.sh

@@ -72,7 +72,7 @@ do
 done
 sed -i "s@^db_name=.*@db_name=$db_name@" ./options.conf
 
-websites=`ls $home_dir | grep -vw default`
+websites=`ls $wwwroot_dir | grep -vw default`
 while :
 do
         echo
@@ -84,7 +84,7 @@ do
         echo $db_name
         for W in `echo $website_name | tr ',' ' '`
         do
-                [ ! -e "$home_dir/$W" ] && { echo -e "\033[31m$home_dir/$W not exist! \033[0m" ; W_tmp=1; }
+                [ ! -e "$wwwroot_dir/$W" ] && { echo -e "\033[31m$wwwroot_dir/$W not exist! \033[0m" ; W_tmp=1; }
         done
         [ "$W_tmp" != '1' ] && break
 done

functions/apache-2.2.sh

@@ -57,8 +57,8 @@ sed -i "s@AddType\(.*\)Z@AddType\1Z\n    AddType application/x-httpd-php .php .p
 sed -i 's@^#LoadModule rewrite_module@LoadModule rewrite_module@' $apache_install_dir/conf/httpd.conf
 sed -i 's@^#LoadModule\(.*\)mod_deflate.so@LoadModule\1mod_deflate.so@' $apache_install_dir/conf/httpd.conf
 sed -i 's@DirectoryIndex index.html@DirectoryIndex index.html index.php@' $apache_install_dir/conf/httpd.conf
-sed -i "s@^DocumentRoot.*@DocumentRoot \"$home_dir/default\"@" $apache_install_dir/conf/httpd.conf
-sed -i "s@^<Directory \"$apache_install_dir/htdocs\">@<Directory \"$home_dir/default\">@" $apache_install_dir/conf/httpd.conf
+sed -i "s@^DocumentRoot.*@DocumentRoot \"$wwwroot_dir/default\"@" $apache_install_dir/conf/httpd.conf
+sed -i "s@^<Directory \"$apache_install_dir/htdocs\">@<Directory \"$wwwroot_dir/default\">@" $apache_install_dir/conf/httpd.conf
 sed -i "s@^#Include conf/extra/httpd-mpm.conf@Include conf/extra/httpd-mpm.conf@" $apache_install_dir/conf/httpd.conf
 
 #logrotate apache log
@@ -82,11 +82,11 @@ cat >> $apache_install_dir/conf/vhost/0.conf << EOF
 NameVirtualHost *:$TMP_PORT
 <VirtualHost *:$TMP_PORT>
     ServerAdmin admin@linuxeye.com
-    DocumentRoot "$home_dir/default"
+    DocumentRoot "$wwwroot_dir/default"
     ServerName $TMP_IP 
     ErrorLog "$wwwlogs_dir/error_apache.log"
     CustomLog "$wwwlogs_dir/access_apache.log" common
-<Directory "$home_dir/default">
+<Directory "$wwwroot_dir/default">
     SetOutputFilter DEFLATE
     Options FollowSymLinks
     AllowOverride All

functions/apache-2.4.sh

@@ -70,8 +70,8 @@ sed -i "s@AddType\(.*\)Z@AddType\1Z\n    AddType application/x-httpd-php .php .p
 sed -i 's@^#LoadModule rewrite_module@LoadModule rewrite_module@' $apache_install_dir/conf/httpd.conf
 sed -i 's@^#LoadModule\(.*\)mod_deflate.so@LoadModule\1mod_deflate.so@' $apache_install_dir/conf/httpd.conf
 sed -i 's@DirectoryIndex index.html@DirectoryIndex index.html index.php@' $apache_install_dir/conf/httpd.conf
-sed -i "s@^DocumentRoot.*@DocumentRoot \"$home_dir/default\"@" $apache_install_dir/conf/httpd.conf
-sed -i "s@^<Directory \"$apache_install_dir/htdocs\">@<Directory \"$home_dir/default\">@" $apache_install_dir/conf/httpd.conf
+sed -i "s@^DocumentRoot.*@DocumentRoot \"$wwwroot_dir/default\"@" $apache_install_dir/conf/httpd.conf
+sed -i "s@^<Directory \"$apache_install_dir/htdocs\">@<Directory \"$wwwroot_dir/default\">@" $apache_install_dir/conf/httpd.conf
 sed -i "s@^#Include conf/extra/httpd-mpm.conf@Include conf/extra/httpd-mpm.conf@" $apache_install_dir/conf/httpd.conf
 
 #logrotate apache log
@@ -94,11 +94,11 @@ mkdir $apache_install_dir/conf/vhost
 cat >> $apache_install_dir/conf/vhost/0.conf << EOF
 <VirtualHost *:$TMP_PORT>
     ServerAdmin admin@linuxeye.com
-    DocumentRoot "$home_dir/default"
+    DocumentRoot "$wwwroot_dir/default"
     ServerName $TMP_IP 
     ErrorLog "$wwwlogs_dir/error_apache.log"
     CustomLog "$wwwlogs_dir/access_apache.log" common
-<Directory "$home_dir/default">
+<Directory "$wwwroot_dir/default">
     SetOutputFilter DEFLATE
     Options FollowSymLinks
     Require all granted

functions/apcu.sh

@@ -24,7 +24,7 @@ apc.ttl=7200
 apc.enable_cli=1
 EOF
 	[ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart
-	/bin/cp apc.php $home_dir/default
+	/bin/cp apc.php $wwwroot_dir/default
 else
         echo -e "\033[31meAPCU module install failed, Please contact the author! \033[0m"
 fi

functions/nginx.sh

@@ -69,7 +69,7 @@ if [ "$Apache_version" == '1' -o "$Apache_version" == '2' ];then
 else
 	/bin/cp conf/nginx.conf $nginx_install_dir/conf/nginx.conf
 fi
-sed -i "s@/home/wwwroot/default@$home_dir/default@" $nginx_install_dir/conf/nginx.conf
+sed -i "s@/home/wwwroot/default@$wwwroot_dir/default@" $nginx_install_dir/conf/nginx.conf
 sed -i "s@/home/wwwlogs@$wwwlogs_dir@g" $nginx_install_dir/conf/nginx.conf
 sed -i "s@^user www www@user $run_user $run_user@" $nginx_install_dir/conf/nginx.conf
 [ "$je_tc_malloc" == '2' ] && sed -i 's@^pid\(.*\)@pid\1\ngoogle_perftools_profiles /tmp/tcmalloc;@' $nginx_install_dir/conf/nginx.conf 

functions/phpmyadmin.sh

@@ -11,11 +11,11 @@ cd $oneinstack_dir/src
 src_url=http://downloads.sourceforge.net/project/phpmyadmin/phpMyAdmin/${phpMyAdmin_version}/phpMyAdmin-${phpMyAdmin_version}-all-languages.tar.gz && Download_src
 
 tar xzf phpMyAdmin-${phpMyAdmin_version}-all-languages.tar.gz
-/bin/mv phpMyAdmin-${phpMyAdmin_version}-all-languages $home_dir/default/phpMyAdmin
-/bin/cp $home_dir/default/phpMyAdmin/{config.sample.inc.php,config.inc.php}
-mkdir $home_dir/default/phpMyAdmin/{upload,save}
-sed -i "s@UploadDir.*@UploadDir'\] = 'upload';@" $home_dir/default/phpMyAdmin/config.inc.php
-sed -i "s@SaveDir.*@SaveDir'\] = 'save';@" $home_dir/default/phpMyAdmin/config.inc.php
-chown -R ${run_user}.$run_user $home_dir/default/phpMyAdmin
+/bin/mv phpMyAdmin-${phpMyAdmin_version}-all-languages $wwwroot_dir/default/phpMyAdmin
+/bin/cp $wwwroot_dir/default/phpMyAdmin/{config.sample.inc.php,config.inc.php}
+mkdir $wwwroot_dir/default/phpMyAdmin/{upload,save}
+sed -i "s@UploadDir.*@UploadDir'\] = 'upload';@" $wwwroot_dir/default/phpMyAdmin/config.inc.php
+sed -i "s@SaveDir.*@SaveDir'\] = 'save';@" $wwwroot_dir/default/phpMyAdmin/config.inc.php
+chown -R ${run_user}.$run_user $wwwroot_dir/default/phpMyAdmin
 cd ..
 }

functions/tengine.sh

@@ -71,7 +71,7 @@ if [ "$Apache_version" == '1' -o "$Apache_version" == '2' ];then
 else
         /bin/cp conf/nginx.conf $tengine_install_dir/conf/nginx.conf
 fi
-sed -i "s@/home/wwwroot/default@$home_dir/default@" $tengine_install_dir/conf/nginx.conf
+sed -i "s@/home/wwwroot/default@$wwwroot_dir/default@" $tengine_install_dir/conf/nginx.conf
 sed -i "s@/home/wwwlogs@$wwwlogs_dir@g" $tengine_install_dir/conf/nginx.conf
 sed -i "s@^user www www@user $run_user $run_user@" $tengine_install_dir/conf/nginx.conf
 [ "$je_tc_malloc" == '2' ] && sed -i 's@^pid\(.*\)@pid\1\ngoogle_perftools_profiles /tmp/tcmalloc;@' $tengine_install_dir/conf/nginx.conf 

functions/test.sh

@@ -17,21 +17,21 @@ echo $public_IP $FLAG_IP
 
 if [ "$FLAG_IP"x == "CN"x ];then
 	src_url=http://mirrors.linuxeye.com/lnmp/src/tz.zip && Download_src
-	unzip -q tz.zip -d $home_dir/default
-	/bin/cp $oneinstack_dir/conf/index_cn.html $home_dir/default/index.html
+	unzip -q tz.zip -d $wwwroot_dir/default
+	/bin/cp $oneinstack_dir/conf/index_cn.html $wwwroot_dir/default/index.html
 else
 	src_url=http://mirrors.linuxeye.com/lnmp/src/tz_e.zip && Download_src
-	unzip -q tz_e.zip -d $home_dir/default;/bin/mv $home_dir/default/{tz_e.php,proberv.php}
-	sed -i 's@https://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js@http://lib.sinaapp.com/js/jquery/1.7/jquery.min.js@' $home_dir/default/proberv.php 
-	/bin/cp $oneinstack_dir/conf/index.html $home_dir/default
+	unzip -q tz_e.zip -d $wwwroot_dir/default;/bin/mv $wwwroot_dir/default/{tz_e.php,proberv.php}
+	sed -i 's@https://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js@http://lib.sinaapp.com/js/jquery/1.7/jquery.min.js@' $wwwroot_dir/default/proberv.php 
+	/bin/cp $oneinstack_dir/conf/index.html $wwwroot_dir/default
 fi
 src_url=https://gist.githubusercontent.com/ck-on/4959032/raw/0b871b345fd6cfcd6d2be030c1f33d1ad6a475cb/ocp.php && Download_src
 
-echo '<?php phpinfo() ?>' > $home_dir/default/phpinfo.php
-[ "$PHP_cache" == '1' ] && /bin/cp ocp.php $home_dir/default && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/ocp.php" target="_blank" class="links">Opcache</a>@' $home_dir/default/index.html
-[ "$PHP_cache" == '3' ] && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/apc.php" target="_blank" class="links">APC</a>@' $home_dir/default/index.html
-[ "$PHP_cache" == '4' ] && /bin/cp eaccelerator-*/control.php $home_dir/default && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/control.php" target="_blank" class="links">eAccelerator</a>@' $home_dir/default/index.html
-chown -R ${run_user}.$run_user $home_dir/default
+echo '<?php phpinfo() ?>' > $wwwroot_dir/default/phpinfo.php
+[ "$PHP_cache" == '1' ] && /bin/cp ocp.php $wwwroot_dir/default && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/ocp.php" target="_blank" class="links">Opcache</a>@' $wwwroot_dir/default/index.html
+[ "$PHP_cache" == '3' ] && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/apc.php" target="_blank" class="links">APC</a>@' $wwwroot_dir/default/index.html
+[ "$PHP_cache" == '4' ] && /bin/cp eaccelerator-*/control.php $wwwroot_dir/default && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/control.php" target="_blank" class="links">eAccelerator</a>@' $wwwroot_dir/default/index.html
+chown -R ${run_user}.$run_user $wwwroot_dir/default
 [ -e "$db_install_dir" -a -z "`ps -ef | grep -v grep | grep mysql`" ] && /etc/init.d/mysqld restart 
 [ -e "$apache_install_dir" -a -z "`ps -ef | grep -v grep | grep apache`" ] && /etc/init.d/httpd restart 
 cd ..

functions/upgrade_phpmyadmin.sh

@@ -5,8 +5,8 @@
 Upgrade_phpMyAdmin()
 {
 cd $oneinstack_dir/src
-[ ! -e "$home_dir/default/phpMyAdmin" ] && echo -e "\033[31mThe phpMyAdmin is not installed on your system!\033[0m " && exit 1
-Old_phpMyAdmin_version=`grep Version $home_dir/default/phpMyAdmin/README | awk '{print $2}'`
+[ ! -e "$wwwroot_dir/default/phpMyAdmin" ] && echo -e "\033[31mThe phpMyAdmin is not installed on your system!\033[0m " && exit 1
+Old_phpMyAdmin_version=`grep Version $wwwroot_dir/default/phpMyAdmin/README | awk '{print $2}'`
 echo -e "Current phpMyAdmin Version: \033[32m$Old_phpMyAdmin_version\033[0m"
 
 while :
@@ -31,13 +31,13 @@ if [ -e "phpMyAdmin-${phpMyAdmin_version}-all-languages.tar.gz" ];then
         echo "Press Ctrl+c to cancel or Press any key to continue..."
         char=`get_char`
 	tar xzf phpMyAdmin-${phpMyAdmin_version}-all-languages.tar.gz 
-	rm -rf $home_dir/default/phpMyAdmin
-	/bin/mv phpMyAdmin-${phpMyAdmin_version}-all-languages $home_dir/default/phpMyAdmin
-	/bin/cp $home_dir/default/phpMyAdmin/{config.sample.inc.php,config.inc.php}
-	mkdir $home_dir/default/phpMyAdmin/{upload,save}
-	sed -i "s@UploadDir.*@UploadDir'\] = 'upload';@" $home_dir/default/phpMyAdmin/config.inc.php
-	sed -i "s@SaveDir.*@SaveDir'\] = 'save';@" $home_dir/default/phpMyAdmin/config.inc.php
-	chown -R ${run_user}.$run_user $home_dir/default/phpMyAdmin
+	rm -rf $wwwroot_dir/default/phpMyAdmin
+	/bin/mv phpMyAdmin-${phpMyAdmin_version}-all-languages $wwwroot_dir/default/phpMyAdmin
+	/bin/cp $wwwroot_dir/default/phpMyAdmin/{config.sample.inc.php,config.inc.php}
+	mkdir $wwwroot_dir/default/phpMyAdmin/{upload,save}
+	sed -i "s@UploadDir.*@UploadDir'\] = 'upload';@" $wwwroot_dir/default/phpMyAdmin/config.inc.php
+	sed -i "s@SaveDir.*@SaveDir'\] = 'save';@" $wwwroot_dir/default/phpMyAdmin/config.inc.php
+	chown -R ${run_user}.$run_user $wwwroot_dir/default/phpMyAdmin
 	cd ..
 	echo -e "You have \033[32msuccessfully\033[0m upgrade from \033[32m$Old_phpMyAdmin_version\033[0m to \033[32m$phpMyAdmin_version\033[0m"
 fi

functions/xcache.sh

@@ -16,8 +16,8 @@ $php_install_dir/bin/phpize
 ./configure --enable-xcache --enable-xcache-coverager --enable-xcache-optimizer --with-php-config=$php_install_dir/bin/php-config
 make && make install
 if [ -f "$php_install_dir/lib/php/extensions/`ls $php_install_dir/lib/php/extensions | grep zts`/xcache.so" ];then
-	/bin/cp -R htdocs $home_dir/default/xcache
-	chown -R ${run_user}.$run_user $home_dir/default/xcache
+	/bin/cp -R htdocs $wwwroot_dir/default/xcache
+	chown -R ${run_user}.$run_user $wwwroot_dir/default/xcache
 	touch /tmp/xcache;chown ${run_user}.$run_user /tmp/xcache
 
         Memtatol=`free -m | grep 'Mem:' | awk '{print $2}'`

install.sh

@@ -43,7 +43,7 @@ local_IP=`./functions/get_local_ip.py`
 # Definition Directory
 . ./options.conf
 . functions/check_os.sh
-mkdir -p $home_dir/default $wwwlogs_dir $oneinstack_dir/{src,conf}
+mkdir -p $wwwroot_dir/default $wwwlogs_dir $oneinstack_dir/{src,conf}
 
 # choice upgrade OS
 while :
@@ -428,7 +428,7 @@ do
                 echo -e "\033[31minput error! Please only input 'y' or 'n'\033[0m"
         else
 		if [ "$phpMyAdmin_yn" == 'y' ];then
-		        [ -d "$home_dir/default/phpMyAdmin" ] && echo -e "\033[31mThe phpMyAdmin already installed! \033[0m" && phpMyAdmin_yn=Other && break
+		        [ -d "$wwwroot_dir/default/phpMyAdmin" ] && echo -e "\033[31mThe phpMyAdmin already installed! \033[0m" && phpMyAdmin_yn=Other && break
 		fi
                 break
         fi
@@ -684,7 +684,7 @@ fi
 . ./options.conf
 
 # index example
-if [ ! -e "$home_dir/default/index.html" -a "$Web_yn" == 'y' ];then
+if [ ! -e "$wwwroot_dir/default/index.html" -a "$Web_yn" == 'y' ];then
 	. functions/test.sh
 	TEST 2>&1 | tee -a $oneinstack_dir/install.log 
 fi
@@ -714,7 +714,7 @@ echo "####################Congratulations########################"
 [ "$PHP_cache" == '4' ] && echo -e "`printf "%-32s" "eAccelerator password:"`\033[32meAccelerator\033[0m"
 [ "$FTP_yn" == 'y' ] && echo -e "\n`printf "%-32s" "Pure-FTPd install dir:"`\033[32m$pureftpd_install_dir\033[0m"
 [ "$FTP_yn" == 'y' ] && echo -e "`printf "%-32s" "Create FTP virtual script:"`\033[32m./pureftpd_vhost.sh\033[0m"
-[ "$phpMyAdmin_yn" == 'y' ] && echo -e "\n`printf "%-32s" "phpMyAdmin dir:"`\033[32m$home_dir/default/phpMyAdmin\033[0m"
+[ "$phpMyAdmin_yn" == 'y' ] && echo -e "\n`printf "%-32s" "phpMyAdmin dir:"`\033[32m$wwwroot_dir/default/phpMyAdmin\033[0m"
 [ "$phpMyAdmin_yn" == 'y' ] && echo -e "`printf "%-32s" "phpMyAdmin Control Panel url:"`\033[32mhttp://$local_IP/phpMyAdmin\033[0m"
 [ "$redis_yn" == 'y' ] && echo -e "\n`printf "%-32s" "redis install dir:"`\033[32m$redis_install_dir\033[0m"
 [ "$memcached_yn" == 'y' ] && echo -e "\n`printf "%-32s" "memcached install dir:"`\033[32m$memcached_install_dir\033[0m"

options.conf

@@ -29,7 +29,7 @@ mariadb_data_dir=/data/mariadb
 percona_data_dir=/data/percona
 
 # web directory, you can customize
-home_dir=/home/wwwroot
+wwwroot_dir=/home/wwwroot
 
 # nginx Generate a log storage directory, you can freely specify.
 wwwlogs_dir=/home/wwwlogs

pureftpd_vhost.sh

@@ -62,9 +62,9 @@ DIRECTORY() {
 while :
 do
 echo
-	read -p "Please input the directory(Default directory: $home_dir): " Directory 
+	read -p "Please input the directory(Default directory: $wwwroot_dir): " Directory 
 	if [ -z "$Directory" ]; then
-	        Directory="$home_dir"
+	        Directory="$wwwroot_dir"
 	fi
 	if [ ! -d "$Directory" ];then
 		echo -e "\033[31mThe directory does not exist\033[0m"

tools/website_bk.sh

@@ -6,8 +6,8 @@
 
 WebSite=$1
 LogFile=$backup_dir/website.log
-[ ! -e "$home_dir/$WebSite" ] && { echo "[$home_dir/$WebSite] not exist" >> $LogFile ;  exit 1 ; }
+[ ! -e "$wwwroot_dir/$WebSite" ] && { echo "[$wwwroot_dir/$WebSite] not exist" >> $LogFile ;  exit 1 ; }
 
 [ ! -e "$backup_dir" ] && mkdir -p $backup_dir
 
-rsync -crazP --delete $home_dir/$WebSite $backup_dir
+rsync -crazP --delete $wwwroot_dir/$WebSite $backup_dir

uninstall.sh

@@ -41,7 +41,7 @@ Uninstall()
 id -u $run_user >/dev/null 2>&1 ; [ $? -eq 0 ] && userdel $run_user
 id -u mysql >/dev/null 2>&1 ; [ $? -eq 0 ] && userdel mysql 
 
-/bin/mv ${home_dir}{,_$(date +%F)}
+/bin/mv ${wwwroot_dir}{,_$(date +%F)}
 /bin/mv ${db_data_dir}{,_$(date +%F)}
 for D in `cat ./options.conf | grep dir= | grep -v oneinstack | awk -F'=' '{print $2}' | sort | uniq`
 do

vhost.sh

@@ -171,9 +171,9 @@ fi
 
 echo
 echo "Please input the directory for the domain:$domain :"
-read -p "(Default directory: $home_dir/$domain): " vhostdir
+read -p "(Default directory: $wwwroot_dir/$domain): " vhostdir
 if [ -z "$vhostdir" ]; then
-        vhostdir="$home_dir/$domain"
+        vhostdir="$wwwroot_dir/$domain"
         echo -e "Virtual Host Directory=\033[32m$vhostdir\033[0m"
 fi
 echo