Update apps.conf and change default directory

apps.conf

@@ -1,6 +1,6 @@
 # newest software version
 # Web
-nginx_version=1.9.5
+nginx_version=1.9.6
 tengine_version=2.1.1
 
 tomcat_7_version=7.0.65
@@ -26,14 +26,14 @@ percona_5_version=5.5.45-37.4
 # JDK
 jdk_6_version=1.6.0_45
 jdk_7_version=1.7.0_80
-jdk_8_version=1.8.0_60
+jdk_8_version=1.8.0_66
 
 # PHP
 php_3_version=5.3.29
 php_4_version=5.4.45
 php_5_version=5.5.30
 php_6_version=5.6.14
-php_7_version=7.0.0RC5
+php_7_version=7.0.0RC6
 
 zendopcache_version=7.0.5
 xcache_version=3.2.0

config/index_cn.html

@@ -30,7 +30,7 @@ font-family:微软雅黑,sans-serif;
 <p><b>创建FTP虚拟账号执行脚本:</b>&nbsp;&nbsp;<font color="#008000">./pureftpd_vhost.sh</font></p>
 <p><b>Github项目地址:</b>&nbsp;&nbsp;<a target="_blank" class="links" href="https://github.com/lj2007331/oneinstack">https://github.com/lj2007331/oneinstack</a></p>
 <p><b>OneinStack官网:</b>&nbsp;&nbsp;<a target="_blank" class="links" href="http://oneinstack.com">http://oneinstack.com</a></p>
-<p><b>QQ群:</b>&nbsp;&nbsp;486321919 438311066(满) 235258658(满)</p>
+<p><b>QQ群:</b>&nbsp;&nbsp;213014293 486321919 438311066(满) 235258658(满)</p>
 <p><b>赞助我们:</b></p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;支付宝:&nbsp;&nbsp;lj2007331@gmail.com</p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PayPal:&nbsp;&nbsp;lj2007331@gmail.com</p>

options.conf

@@ -29,10 +29,10 @@ mariadb_data_dir=/data/mariadb
 percona_data_dir=/data/percona
 
 # web directory, you can customize
-wwwroot_dir=/home/wwwroot
+wwwroot_dir=/data/wwwroot
 
 # nginx Generate a log storage directory, you can freely specify.
-wwwlogs_dir=/home/wwwlogs
+wwwlogs_dir=/data/wwwlogs
 
 #########################################################################
 # automatically generated, You can't change 
@@ -40,7 +40,7 @@ dbrootpwd=
 
 #########################################################################
 # Backup Dest directory, change this if you have someother location
-backup_dir=/home/backup
+backup_dir=/data/backup
 
 # How many days before the backup directory will be removed
 expired_days=5

uninstall.sh

@@ -36,12 +36,12 @@ Uninstall()
 [ -e "$nginx_install_dir" ] && service nginx stop && rm -rf /etc/init.d/nginx /etc/logrotate.d/nginx
 [ -e "$tengine_install_dir" ] && service nginx stop && rm -rf /etc/init.d/nginx /etc/logrotate.d/nginx
 [ -e "$pureftpd_install_dir" ] && service pureftpd stop && rm -rf /etc/init.d/pureftpd
-[ -e "$redis_install_dir" ] && service redis-server stop && rm -rf /etc/init.d/redis-server
-[ -e "$memcached_install_dir" ] && service memcached stop && rm -rf /etc/init.d/memcached
+[ -e "$redis_install_dir" ] && service redis-server stop && rm -rf /etc/init.d/redis-server /usr/local/bin/redis-*
+[ -e "$memcached_install_dir" ] && service memcached stop && rm -rf /etc/init.d/memcached /usr/bin/memcached
 [ -e "/usr/local/imagemagick" ] && rm -rf /usr/local/imagemagick 
 [ -e "/usr/local/graphicsmagick" ] && rm -rf /usr/local/graphicsmagick 
 [ -e "/etc/init.d/supervisord" ] && service supervisord stop && { rm -rf /etc/supervisord.conf /etc/init.d/supervisord; } 
-[ -e "/usr/bin/hhvm" ] && { rpm -e hhvm ; rm -rf /etc/hhvm /var/log/hhvm; }
+[ -e "/usr/bin/hhvm" ] && { rpm -e hhvm ; rm -rf /etc/hhvm /var/log/hhvm /usr/bin/hhvm; }
 id -u $run_user >/dev/null 2>&1 ; [ $? -eq 0 ] && userdel $run_user
 id -u mysql >/dev/null 2>&1 ; [ $? -eq 0 ] && userdel mysql 
 
@@ -77,7 +77,7 @@ done
 [ -e "$db_install_dir" ] && echo -e "/etc/init.d/mysqld\n/etc/my.cnf"
 [ -e "$php_install_dir/bin/phpize" ] && echo '/etc/init.d/php-fpm'
 [ -e "$pureftpd_install_dir" ] && echo '/etc/init.d/pureftpd'
-[ -e "$memcached_install_dir" ] && echo '/etc/init.d/memcached' 
+[ -e "$memcached_install_dir" ] && echo -e "/etc/init.d/memcached\n/usr/bin/memcached"
 [ -e "$redis_install_dir" ] && echo '/etc/init.d/redis-server' 
 [ -e "/usr/local/imagemagick" ] && echo '/usr/local/imagemagick' 
 [ -e "/usr/local/graphicsmagick" ] && echo '/usr/local/graphicsmagick' 

upgrade.sh

@@ -17,6 +17,8 @@ printf "
 #       For more information please visit http://oneinstack.com       #
 #######################################################################
 "
+# get pwd
+sed -i "s@^oneinstack_dir.*@oneinstack_dir=`pwd`@" ./options.conf
 
 . ./options.conf
 . ./include/color.sh