Update apps.conf

apps.conf

@@ -41,8 +41,8 @@ jdk_7_version=1.7.80
 jdk_8_version=1.8.45
 
 # tomcat
-tomcat_7_version=7.0.62
-tomcat_8_version=8.0.23
+tomcat_7_version=7.0.63
+tomcat_8_version=8.0.24
 
 # Ftp
 pureftpd_version=1.0.41
@@ -58,7 +58,7 @@ memcached_pecl_version=2.2.0
 memcache_pecl_version=2.2.7
 
 # phpMyadmin
-phpMyAdmin_version=4.4.10
+phpMyAdmin_version=4.4.11
 
 # malloc
 tcmalloc_version=2.4

backup.sh

@@ -8,11 +8,12 @@
 # Project home page:
 #       http://oneinstack.com
 
-. ./options.conf
+cd tools
+. ../options.conf
+
 DB_Local_BK() {
 	for D in `echo $db_name | tr ',' ' '`
 	do
-		cd $oneinstack_dir/tools
 		./db_bk.sh $D
 	done
 }
@@ -20,19 +21,17 @@ DB_Local_BK() {
 DB_Remote_BK() {
         for D in `echo $db_name | tr ',' ' '`
         do
-                cd $oneinstack_dir/tools
                 ./db_bk.sh $D
 		DB_GREP="DB_${D}_`date +%Y`"
                 DB_FILE=`ls -lrt $backup_dir | grep ${DB_GREP} | tail -1 | awk '{print $NF}'`
-                echo "file:::$backup_dir/$DB_FILE $backup_dir push" >> $oneinstack_dir/tools/config.txt
-                echo "com:::[ -e "$backup_dir/$DB_FILE" ] && rm -rf $backup_dir/DB_${D}_$(date +%Y%m%d --date="$expired_days days ago")_*.tgz" >> $oneinstack_dir/tools/config.txt
+                echo "file:::$backup_dir/$DB_FILE $backup_dir push" >> config_bakcup.txt
+                echo "com:::[ -e "$backup_dir/$DB_FILE" ] && rm -rf $backup_dir/DB_${D}_$(date +%Y%m%d --date="$expired_days days ago")_*.tgz" >> config_bakcup.txt
         done
 }
 
 WEB_Local_BK() {
 	for W in `echo $website_name | tr ',' ' '`
         do
-                cd $oneinstack_dir/tools
                 ./website_bk.sh $W
         done
 }
@@ -40,8 +39,7 @@ WEB_Local_BK() {
 WEB_Remote_BK() {
         for W in `echo $website_name | tr ',' ' '`
         do
-		cd $oneinstack_dir/tools
-                echo "file:::$wwwroot_dir/$W $backup_dir push" >> $oneinstack_dir/tools/config.txt
+                echo "file:::$wwwroot_dir/$W $backup_dir push" >> config_bakcup.txt
         done
 }
 
@@ -49,15 +47,15 @@ if [ "$local_bankup_yn" == 'y' -a "$remote_bankup_yn" == 'n' ];then
 	WEB_Local_BK
 	DB_Local_BK
 elif [ "$local_bankup_yn" == 'n' -a "$remote_bankup_yn" == 'y' ];then
-	echo "com:::[ ! -e "$backup_dir" ] && mkdir -p $backup_dir" > $oneinstack_dir/tools/config.txt
+	echo "com:::[ ! -e "$backup_dir" ] && mkdir -p $backup_dir" > config_bakcup.txt
 	DB_Remote_BK
 	WEB_Remote_BK
-	./mabs.sh -T -1 | tee mabs.log	
+	./mabs.sh -c config_bakcup.txt -T -1 | tee mabs.log
 elif [ "$local_bankup_yn" == 'y' -a "$remote_bankup_yn" == 'y' ];then
-	echo "com:::[ ! -e "$backup_dir" ] && mkdir -p $backup_dir" > $oneinstack_dir/tools/config.txt
+	echo "com:::[ ! -e "$backup_dir" ] && mkdir -p $backup_dir" > config_bakcup.txt
 	WEB_Local_BK
 	WEB_Remote_BK
 	DB_Local_BK
 	DB_Remote_BK
-	./mabs.sh -T -1 | tee mabs.log	
+	./mabs.sh -c config_bakcup.txt -T -1 | tee mabs.log	
 fi