Merge pull request #19 from kamly/feature/v1.4

Feature/v1.4

Author: kamly

.gitignore

@@ -1,3 +1,3 @@
-src
-log
+install_uninstall/src
+logs
 

README.md

@@ -40,13 +40,16 @@ apt-get install -y git # 安装git
 mkdir -p /data
 cd /data
 git clone https://github.com/kamly/automated-operation.git
+# 安装包目录
+cd automated-operation/install_uninstall
+mkdir src
 ```
 
-## 2. 上传软件包到服务器
+## 2. 上传软件包到服务器或者在线下载安装包
 
 软件安装包存放在[云盘](https://pan.baidu.com/s/1jJYgAN0)。
 
-先下载到本地，然后上传到服务器的 `./src/` 目录中
+先下载到本地，然后上传到服务器的 `./install_uninstall/src/` 目录中
 
 ## 3. 各脚本使用方法
 

backup_import/include/public.sh

@@ -0,0 +1 @@
+#!/bin/bash  

mysql_backup_import.sh renamed to backup_import/mysql_backup_import.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
-. include/common.sh # 引入常量文件
-. include/public.sh # 引入公用函数
+. ../include/common.sh # 引入常量文件
+. ../include/public.sh # 引入公用函数
+. ../include/sysinfo.sh # 输出系统信息
 
-. include/sysinfo.sh # 输出系统信息
+. ./include/public.sh
 
 # 备份
 mysql_sql_backup(){
@@ -14,32 +15,33 @@ mysql_sql_backup(){
         service mysqld start # 启动mysql
     fi
 
-    $mysql_install_dir/bin/mysqldump -u$mysql_enter_user -P$mysql_port -p$mysql_root_pass --all-databases > $mysql_data_backup  # data
-    cp -R $mysql_install_dir/etc $mysql_backup  # etc
+    mkdir ${mysql_backup}
+    ${mysql_install_dir}/bin/mysqldump -u${mysql_enter_user} -P${mysql_port} -p${mysql_root_pass} --all-databases > ${mysql_backup}/mysql_`date +%Y%m%d`.sql  # data
+    cp -R ${mysql_install_dir}/etc ${mysql_backup}  # etc
 
     if [[ $? == 0 ]];then
-        echo -e " \033[32m Backup Mysql Data success! \033[0m"
+        echo -e " ${RED} Backup Mysql Data success! "
     else
-        echo -e " \033[32m Backup failed, pls check... \033[0m " 
+        echo -e " ${RED} Backup failed, pls check... " 
     fi
 }
 
 # 导入
 mysql_sql_import(){
-    $mysql_install_dir/bin/mysql -u$mysql_enter_user -P$mysql_port -p$mysql_root_pass < ${data_backup_dir}/mysql_$backup_name.sql
+    ${mysql_install_dir}/bin/mysql -u${mysql_enter_user} -P${mysql_port} -p${mysql_root_pass} < ${mysql_backup}/mysql_${backup_name}.sql
 
     if [[ $? == 0 ]];then
-        echo -e " \033[32m import mysql Data success! \033[0m"
+        echo -e " ${RED} import mysql Data success! "
     else
-        echo -e " \033[32m import failed, pls check... \033[0m " 
+        echo -e " ${RED} import failed, pls check... " 
     fi
 }
 
 
 # 备份命令 ./mysql_backup_import.sh backup  
 # 导入命令(指定日期) ./mysql_backup_import.sh import 20180211
 
-if [ ! -d $mysql_install_dir ];then
+if [ ! -d ${mysql_install_dir} ];then
     # 没有安装mysql
     echo -e "${RED} No Mysql Server in your System!!"
 else
@@ -53,13 +55,13 @@ else
         mysql_root_pass=${mysql_root_pass:=root} # 提供默认
 
         if [ $1 == "backup" ];then
-            echo -e "You select backup Mysql Data from $mysql_data"
+            echo -e "You select backup Mysql Data from ${mysql_data}"
             mysql_sql_backup
         elif [ $1 == "import" ];then
             if [ -z $2 ];then
                 echo -e "${WHITE} Usage { $0 backup|import 20180211 }${WHITE}"
             else
-                echo -e "You select import Mysql Data to $data_backup_dir"
+                echo -e "You select import Mysql Data to ${data_backup_dir}"
                 backup_name=$2
                 mysql_sql_import
             fi

nginx_back.sh renamed to backup_import/nginx_backup.sh

@@ -1,22 +1,24 @@
 #!/bin/bash
 
-. include/common.sh # 引入常量文件
-. include/public.sh # 引入公用函数
+. ../include/common.sh # 引入常量文件
+. ../include/public.sh # 引入公用函数
+. ../include/sysinfo.sh # 输出系统信息
 
-. include/sysinfo.sh # 输出系统信息
+. ./include/public.sh
 
 # 备份
 nginx_backup(){
 
-    check_backup_dir
+    check_dir_exist ${data_backup_dir}
 
     if [[ `ps aux | grep nginx|grep -v grep|wc -l` == 0 ]];then
         service nginx start # 
     fi
 
-    mv  /data/www /data/www_backup # www
-    cp -R $ngx_install_dir/ssl $nginx_backup # ssl
-    cp -R $ngx_install_dir/conf $nginx_backup # conf
+    mv  /data/www /data/www_backup # www 只是移动目录
+    check_dir_exist ${nginx_backup}
+    cp -R ${nginx_install_dir}/ssl ${nginx_backup} # ssl
+    cp -R ${nginx_install_dir}/conf ${nginx_backup} # conf
 
     if [[ $? == 0 ]];then
         echo -e " \033[32m Backup nginx Data success! \033[0m"
@@ -29,7 +31,7 @@ nginx_backup(){
 
 # 备份命令 ./nginx_backup_import.sh backup  
 
-if [ ! -d $ngx_install_dir ];then
+if [ ! -d ${nginx_install_dir} ];then
     # 没有安装nginx
     echo -e "${RED} No Nginx Server in your System!!"
 else

redis_back_import.sh renamed to backup_import/redis_backup_import.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
-. include/common.sh # 引入常量文件
-. include/public.sh # 引入公用函数
+. ../include/common.sh # 引入常量文件
+. ../include/public.sh # 引入公用函数
+. ../include/sysinfo.sh # 输出系统信息
 
-. include/sysinfo.sh # 输出系统信息
+. ./include/public.sh
 
 # 备份
 redis_backup(){
@@ -14,33 +15,34 @@ redis_backup(){
         service redis start # redis
     fi
 
-    $redis_install_dir/src/redis-cli -h 127.0.0.1 -p ${redis_port} -a "${redis_root_pass}" SAVE # data
-    mv $redis_data/dump.rdb  $redis_data_backup # data
-    cp -R $redis_install_dir/etc $redis_backup # etc
+    mkdir ${redis_backup}
+    ${redis_install_dir}/src/redis-cli -h 127.0.0.1 -p ${redis_port} -a "${redis_root_pass}" SAVE # data
+    mv ${redis_data}/dump.rdb  ${redis_backup}/redis_`date +%Y%m%d`.rdb # data
+    cp -R ${redis_install_dir}/etc ${redis_backup} # etc
 
     if [[ $? == 0 ]];then
-        echo -e " \033[32m Backup redis Data success! \033[0m"
+        echo -e " ${RED} Backup redis Data success! "
     else
-        echo -e " \033[32m Backup failed, pls check... \033[0m " 
+        echo -e " ${RED} Backup failed, pls check... " 
     fi
 }
 
 # 导入
 redis_import(){
-    cp $data_backup_dir/redis_$backup_name.rdb $redis_data/dump.rdb 
+    cp ${redis_backup}/redis_${backup_name}.rdb ${redis_data}/dump.rdb 
 
     if [[ $? == 0 ]];then
-        echo -e " \033[32m import redis Data success! \033[0m"
+        echo -e " ${RED} import redis Data success! "
     else
-        echo -e " \033[32m import failed, pls check... \033[0m " 
+        echo -e " ${RED} import failed, pls check... " 
     fi
 }
 
 
 # 备份命令 ./redis_backup_import.sh backup  
 # 导入命令(指定日期) ./redis_backup_import.sh import 20180211
 
-if [ ! -d $redis_install_dir ];then
+if [ ! -d ${redis_install_dir} ];then
     # 没有安装redis
     echo -e "${RED} No Redis Server in your System!!"
 else
@@ -54,13 +56,13 @@ else
         redis_root_pass=${redis_root_pass:=root} # 提供默认
 
         if [ $1 == "backup" ];then
-            echo -e "You select backup Redis Data from $redis_data"
+            echo -e "You select backup Redis Data from ${redis_data}"
             redis_backup
         elif [ $1 == "import" ];then
             if [ -z $2 ];then
                 echo -e "${WHITE} Usage { $0 backup|import 20180211 }${WHITE}"
             else
-                echo -e "You select import Redis Data to $data_backup_dir"
+                echo -e "You select import Redis Data to ${data_backup_dir}"
                 backup_name=$2
                 redis_import
             fi