Update sodium option

backup.sh

@@ -18,28 +18,28 @@ pushd ${oneinstack_dir}/tools > /dev/null
 DB_Local_BK() {
   for D in `echo ${db_name} | tr ',' ' '`
   do
-    ./db_bk.sh $D
+    ./db_bk.sh ${D}
   done
 }
 
 DB_Remote_BK() {
   for D in `echo ${db_name} | tr ',' ' '`
   do
-    ./db_bk.sh $D
-    DB_GREP="DB_${D}_`date +%Y`"
+    ./db_bk.sh ${D}
+    DB_GREP="DB_${D}_`date +%Y%m%d`"
     DB_FILE=`ls -lrt ${backup_dir} | grep ${DB_GREP} | tail -1 | awk '{print $NF}'`
-    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
+    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
 }
 
 DB_OSS_BK() {
   for D in `echo ${db_name} | tr ',' ' '`
   do
-    ./db_bk.sh $D
-    DB_GREP="DB_${D}_`date +%Y`"
+    ./db_bk.sh ${D}
+    DB_GREP="DB_${D}_`date +%Y%m%d`"
     DB_FILE=`ls -lrt ${backup_dir} | grep ${DB_GREP} | tail -1 | awk '{print $NF}'`
-    /usr/local/bin/ossutil cp -f ${backup_dir}/$DB_FILE oss://${oss_bucket}/`date +%F`/$DB_FILE
+    /usr/local/bin/ossutil cp -f ${backup_dir}/${DB_FILE} oss://${oss_bucket}/`date +%F`/${DB_FILE}
     [ $? -eq 0 ] && /usr/local/bin/ossutil rm -rf oss://${oss_bucket}/`date +%F --date="${expired_days} days ago"`/
   done
 }
@@ -47,10 +47,10 @@ DB_OSS_BK() {
 DB_COS_BK() {
   for D in `echo ${db_name} | tr ',' ' '`
   do
-    ./db_bk.sh $D
-    DB_GREP="DB_${D}_`date +%Y`"
+    ./db_bk.sh ${D}
+    DB_GREP="DB_${D}_`date +%Y%m%d`"
     DB_FILE=`ls -lrt ${backup_dir} | grep ${DB_GREP} | tail -1 | awk '{print $NF}'`
-    ${python_install_dir}/bin/coscmd upload ${backup_dir}/$DB_FILE /`date +%F`/$DB_FILE
+    ${python_install_dir}/bin/coscmd upload ${backup_dir}/${DB_FILE} /`date +%F`/${DB_FILE}
     [ $? -eq 0 ] && ${python_install_dir}/bin/coscmd delete -r -f `date +%F --date="${expired_days} days ago"` > /dev/null 2>&1
   done
 }
@@ -58,10 +58,10 @@ DB_COS_BK() {
 DB_UPYUN_BK() {
   for D in `echo ${db_name} | tr ',' ' '`
   do
-    ./db_bk.sh $D
-    DB_GREP="DB_${D}_`date +%Y`"
+    ./db_bk.sh ${D}
+    DB_GREP="DB_${D}_`date +%Y%m%d`"
     DB_FILE=`ls -lrt ${backup_dir} | grep ${DB_GREP} | tail -1 | awk '{print $NF}'`
-    /usr/local/bin/upx put ${backup_dir}/$DB_FILE /`date +%F`/$DB_FILE
+    /usr/local/bin/upx put ${backup_dir}/${DB_FILE} /`date +%F`/${DB_FILE}
     [ $? -eq 0 ] && /usr/local/bin/upx rm -a `date +%F --date="${expired_days} days ago"` > /dev/null 2>&1
   done
 }
@@ -78,7 +78,7 @@ WEB_Remote_BK() {
   do
     if [ `du -sm "${wwwroot_dir}/$WebSite" | awk '{print $1}'` -lt 1024 ]; then
       ./website_bk.sh $W
-      Web_GREP="Web_${W}_`date +%Y`"
+      Web_GREP="Web_${W}_`date +%Y%m%d`"
       Web_FILE=`ls -lrt ${backup_dir} | grep ${Web_GREP} | tail -1 | awk '{print $NF}'`
       echo "file:::${backup_dir}/$Web_FILE ${backup_dir} push" >> config_bakcup.txt
       echo "com:::[ -e "${backup_dir}/$Web_FILE" ] && rm -rf ${backup_dir}/Web_${W}_$(date +%Y%m%d --date="${expired_days} days ago")_*.tgz" >> config_bakcup.txt

include/check_dir.sh

@@ -9,12 +9,12 @@
 #       https://github.com/lj2007331/oneinstack
 
 # check MySQL dir
-[ -d "$mysql_install_dir/support-files" ] && { db_install_dir=$mysql_install_dir; db_data_dir=${mysql_data_dir}; }
+[ -d "${mysql_install_dir}/support-files" ] && { db_install_dir=${mysql_install_dir}; db_data_dir=${mysql_data_dir}; }
 [ -d "${mariadb_install_dir}/support-files" ] && { db_install_dir=${mariadb_install_dir}; db_data_dir=${mariadb_data_dir}; }
 [ -d "${percona_install_dir}/support-files" ] && { db_install_dir=${percona_install_dir}; db_data_dir=${percona_data_dir}; }
-[ -d "$alisql_install_dir/support-files" ] && { db_install_dir=$alisql_install_dir; db_data_dir=$alisql_data_dir; }
+[ -d "${alisql_install_dir}/support-files" ] && { db_install_dir=${alisql_install_dir}; db_data_dir=$alisql_data_dir; }
 
 # check Nginx dir
-[ -e "$nginx_install_dir/sbin/nginx" ] && web_install_dir=$nginx_install_dir
-[ -e "$tengine_install_dir/sbin/nginx" ] && web_install_dir=$tengine_install_dir
-[ -e "$openresty_install_dir/nginx/sbin/nginx" ] && web_install_dir=$openresty_install_dir/nginx
+[ -e "${nginx_install_dir}/sbin/nginx" ] && web_install_dir=${nginx_install_dir}
+[ -e "${tengine_install_dir}/sbin/nginx" ] && web_install_dir=${tengine_install_dir}
+[ -e "${openresty_install_dir}/nginx/sbin/nginx" ] && web_install_dir=${openresty_install_dir}/nginx

include/mysql-8.0.sh

@@ -79,6 +79,7 @@ no-auto-rehash
 [mysqld]
 port = 3306
 socket = /tmp/mysql.sock
+default_authentication_plugin = mysql_native_password
 
 basedir = ${mysql_install_dir}
 datadir = ${mysql_data_dir}
@@ -90,8 +91,6 @@ server-id = 1
 init-connect = 'SET NAMES utf8mb4'
 character-set-server = utf8mb4
 
-default_authentication_plugin=mysql_native_password
-
 skip-name-resolve
 #skip-networking
 back_log = 300

include/php-7.2.sh

@@ -40,7 +40,7 @@ Install_PHP72() {
   if [ ! -e "/usr/local/lib/libsodium.la" ]; then
     tar xzf libsodium-${libsodium_ver}.tar.gz
     pushd libsodium-${libsodium_ver}
-    ./configure
+    ./configure --disable-dependency-tracking --enable-minimal
     make -j ${THREAD} && make install
     popd
     rm -rf libsodium-${libsodium_ver}

install.sh

@@ -713,7 +713,7 @@ fi
 # Database
 case "${db_option}" in
   1)
-    [ "${OS}" == 'CentOS' -a ${CentOS_ver} != '7' ] && dbinstallmethod=1
+    [ "${OS}" == 'CentOS' -a "${CentOS_ver}" != '7' ] && dbinstallmethod=1
     if [ "${dbinstallmethod}" == "2" ]; then
       . include/boost.sh
       installBoost 2>&1 | tee -a ${oneinstack_dir}/install.log
@@ -990,7 +990,7 @@ fi
 
 # Starting DB
 [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
-[ -d "${db_install_dir}/support-files" -a -z "$(ps -ef | grep -v grep | grep mysql)" ] && /etc/init.d/mysqld start
+[ -d "${db_install_dir}/support-files" ] && service mysqld start
 endTime=`date +%s`
 ((installTime=($endTime-$startTime)/60))
 echo "####################Congratulations########################"

ss.sh

@@ -141,7 +141,7 @@ Install_SS-libev() {
   if [ ! -e "/usr/local/lib/libsodium.la" ]; then
     tar xzf libsodium-${libsodium_ver}.tar.gz
     pushd libsodium-${libsodium_ver}
-    ./configure
+    ./configure --disable-dependency-tracking --enable-minimal
     make -j ${THREAD} && make install
     popd
     rm -rf libsodium-${libsodium_ver}

tools/db_bk.sh

@@ -15,26 +15,27 @@ DBname=$1
 LogFile=${backup_dir}/db.log
 DumpFile=${backup_dir}/DB_${DBname}_$(date +%Y%m%d_%H).sql
 NewFile=${backup_dir}/DB_${DBname}_$(date +%Y%m%d_%H).tgz
-OldFile=${backup_dir}/DB_${DBname}_$(date +%Y%m%d --date="$expired_days days ago")*.tgz
+OldFile=${backup_dir}/DB_${DBname}_$(date +%Y%m%d --date="${expired_days} days ago")*.tgz
 
 [ ! -e "${backup_dir}" ] && mkdir -p ${backup_dir}
 
-DB_tmp=`${db_install_dir}/bin/mysql -uroot -p$dbrootpwd -e "show databases\G" | grep $DBname`
-[ -z "$DB_tmp" ] && { echo "[$DBname] not exist" >> $LogFile ;  exit 1 ; }
+DB_tmp=`${db_install_dir}/bin/mysql -uroot -p${dbrootpwd} -e "show databases\G" | grep ${DBname}`
+[ -z "${DB_tmp}" ] && { echo "[${DBname}] not exist" >> ${LogFile} ;  exit 1 ; }
 
-if [ -n "`ls $OldFile 2>/dev/null`" ]; then
-  /bin/rm -f $OldFile
-  echo "[$OldFile] Delete Old File Success" >> $LogFile
+if [ -n "`ls ${OldFile} 2>/dev/null`" ]; then
+  rm -f ${OldFile}
+  echo "[${OldFile}] Delete Old File Success" >> ${LogFile}
 else
-  echo "[$OldFile] Delete Old Backup File" >> $LogFile
+  echo "[${OldFile}] Delete Old Backup File" >> ${LogFile}
 fi
 
-if [ -e "$NewFile" ]; then
-  echo "[$NewFile] The Backup File is exists, Can't Backup" >> $LogFile
+if [ -e "${NewFile}" ]; then
+  echo "[${NewFile}] The Backup File is exists, Can't Backup" >> ${LogFile}
 else
-  ${db_install_dir}/bin/mysqldump -uroot -p$dbrootpwd --databases $DBname > $DumpFile
-  cd ${backup_dir}
-  tar czf $NewFile ${DumpFile##*/} >> $LogFile 2>&1
-  echo "[$NewFile] Backup success ">> $LogFile
-  /bin/rm -f $DumpFile
+  ${db_install_dir}/bin/mysqldump -uroot -p${dbrootpwd} --databases ${DBname} > ${DumpFile}
+  pushd ${backup_dir}
+  tar czf ${NewFile} ${DumpFile##*/} >> ${LogFile} 2>&1
+  echo "[${NewFile}] Backup success ">> ${LogFile}
+  rm -f ${DumpFile}
+  popd > /dev/null
 fi

tools/website_bk.sh

@@ -13,26 +13,26 @@
 WebSite=$1
 LogFile=${backup_dir}/web.log
 NewFile=${backup_dir}/Web_${WebSite}_$(date +%Y%m%d_%H).tgz
-OldFile=${backup_dir}/Web_${WebSite}_$(date +%Y%m%d --date="$expired_days days ago")*.tgz
+OldFile=${backup_dir}/Web_${WebSite}_$(date +%Y%m%d --date="${expired_days} days ago")*.tgz
 [ ! -e "${backup_dir}" ] && mkdir -p ${backup_dir}
-[ ! -e "$wwwroot_dir/$WebSite" ] && { echo "[$wwwroot_dir/$WebSite] not exist" >> $LogFile ;  exit 1 ; }
+[ ! -e "${wwwroot_dir}/${WebSite}" ] && { echo "[${wwwroot_dir}/${WebSite}] not exist" >> ${LogFile} ;  exit 1 ; }
 
-if [ `du -sm "$wwwroot_dir/$WebSite" | awk '{print $1}'` -lt 1024 ]; then
-  if [ -n "`ls $OldFile 2>/dev/null`" ]; then
-    /bin/rm -f $OldFile
-    echo "[$OldFile] Delete Old File Success" >> $LogFile
+if [ `du -sm "${wwwroot_dir}/${WebSite}" | awk '{print $1}'` -lt 1024 ]; then
+  if [ -n "`ls ${OldFile} 2>/dev/null`" ]; then
+    rm -f ${OldFile}
+    echo "[${OldFile}] Delete Old File Success" >> ${LogFile}
   else
-    echo "[$OldFile] Delete Old Backup File" >> $LogFile
+    echo "[${OldFile}] Delete Old Backup File" >> ${LogFile}
   fi
 
-  if [ -e "$NewFile" ]; then
-    echo "[$NewFile] The Backup File is exists, Can't Backup" >> $LogFile
+  if [ -e "${NewFile}" ]; then
+    echo "[${NewFile}] The Backup File is exists, Can't Backup" >> ${LogFile}
   else
-    pushd $wwwroot_dir > /dev/null
-    tar czf $NewFile ./${WebSite} >> $LogFile 2>&1
-    echo "[$NewFile] Backup success ">> $LogFile
+    pushd ${wwwroot_dir} > /dev/null
+    tar czf ${NewFile} ./${WebSite} >> ${LogFile} 2>&1
+    echo "[${NewFile}] Backup success ">> ${LogFile}
     popd > /dev/null
   fi
 else
-  rsync -crazP --delete $wwwroot_dir/$WebSite ${backup_dir}
+  rsync -crazP --delete ${wwwroot_dir}/${WebSite} ${backup_dir}
 fi