调整目录

README.md

@@ -57,22 +57,22 @@
 
 - 研发环境
   - JDK
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/jdk) | [**`Docs`**](docs/linux/ops/service/jdk.md) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/jdk) | [**`Docs`**](docs/linux/ops/service/jdk.md) |
   - Maven
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/maven) | [**`Docs`**](https://github.com/dunwu/javastack/tree/master/docs/javatool/build/maven) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/maven) | [**`Docs`**](https://github.com/dunwu/javastack/tree/master/docs/javatool/build/maven) |
   - Nginx
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/nginx) | [**`Docs`**](https://github.com/dunwu/nginx-tutorial) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/nginx) | [**`Docs`**](https://github.com/dunwu/nginx-tutorial) |
   - Nodejs
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/nodejs) | [**`Docs`**](docs/linux/ops/service/nodejs.md) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/nodejs) | [**`Docs`**](docs/linux/ops/service/nodejs.md) |
   - Tomcat
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/tomcat) | [**`Docs`**](docs/linux/ops/service/tomcat.md) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/tomcat) | [**`Docs`**](docs/linux/ops/service/tomcat.md) |
   - Zookeeper
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/zookeeper) | [**`Docs`**](docs/linux/ops/service/zookeeper.md) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/zookeeper) | [**`Docs`**](docs/linux/ops/service/zookeeper.md) |
 - 研发工具
   - Nexus - Maven 私服。
     - | [**`Docs`**](docs/linux/ops/service/nexus.md) |
   - Jenkins - 持续集成和持续交付平台。
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/jenkins) | [**`Docs`**](docs/linux/ops/service/jenkins.md) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/jenkins) | [**`Docs`**](docs/linux/ops/service/jenkins.md) |
   - Elastic - 常被称为 `ELK` ，是 Java 世界最流行的分布式日志解决方案 。 `ELK` 是 Elastic 公司旗下三款产品 [ElasticSearch](https://www.elastic.co/products/elasticsearch) 、[Logstash](https://www.elastic.co/products/logstash) 、[Kibana](https://www.elastic.co/products/kibana) 的首字母组合。
     - | [**`Docs`**](docs/linux/ops/service/elastic) |
 - 版本控制
@@ -81,18 +81,18 @@
     - | [**`Docs`**](docs/linux/ops/service/svn.md) |
 - 消息中间件
   - Kafka - 应该是 Java 世界最流行的消息中间件了吧。
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/kafka) | [**`Docs`**](docs/linux/ops/service/kafka.md) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/kafka) | [**`Docs`**](docs/linux/ops/service/kafka.md) |
   - RocketMQ - 阿里巴巴开源的消息中间件。
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/rocketmq) | [**`Docs`**](docs/linux/ops/service/rocketmq.md) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/rocketmq) | [**`Docs`**](docs/linux/ops/service/rocketmq.md) |
 - 数据库
   - Mysql - 关系型数据库
     - | [**`Docs`**](https://github.com/dunwu/database/blob/master/docs/mysql/install-mysql.md) |
   - PostgreSQL - 关系型数据库
     - | [**`Docs`**](https://github.com/dunwu/database/blob/master/docs/postgresql.md#安装) |
   - Mongodb - Nosql
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/mongodb) | [**`Docs`**](https://github.com/dunwu/database/blob/master/docs/mongodb/install-mongodb.md) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/mongodb) | [**`Docs`**](https://github.com/dunwu/database/blob/master/docs/mongodb/install-mongodb.md) |
   - Redis - Nosql
-    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/deploy/tool/redis) | [**`Docs`**](https://github.com/dunwu/database/blob/master/docs/redis/install-redis.md) |
+    - | [**`Scripts`**](https://github.com/dunwu/os-tutorial/tree/master/codes/linux/ops/service/redis) | [**`Docs`**](https://github.com/dunwu/database/blob/master/docs/redis/install-redis.md) |
 
 ### [Windows](docs/windows)
 

codes/deploy/tool/jdk/README.md

@@ -1,23 +0,0 @@
-# 安装 JDK
-
-## linux 安装JDK通用脚本
-
-使用方法：
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/jdk/install-jdk8.sh | bash
-```
-
-脚本会下载解压 jdk8 到 `/opt/java` 路径下。
-
-## Centos 安装JDK脚本
-
-使用方法：
-
-```sh
-wget --no-check-certificate --no-cookies https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/jdk/install-jdk8-by-yum.sh
-chmod -R 777 install-jdk8-by-yum.sh
-./install-jdk8-by-yum.sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/jdk/install-jdk8-by-yum.sh | bash
-```
-脚本会下载解压 jdk8 到 `/usr/lib/jvm/java` 路径下。

codes/deploy/tool/jdk/install-jdk8.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-###################################################################################
-# 安装 JDK8 脚本
-# 适用于所有 linux 发行版本。
-# JDK 会被安装到 /opt/java/jdk1.8.0_162 路径。
-# Author: Zhang Peng
-###################################################################################
-
-echo -e "\n>>>>>>>>> install jdk8"
-
-mkdir -p /opt/java
-wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" -O /opt/java/jdk-8u162-linux-x64.tar.gz  http://download.oracle.com/otn-pub/java/jdk/8u162-b12/0da788060d494f5095bf8624735fa2f1/jdk-8u162-linux-x64.tar.gz
-
-cd /opt/java
-tar -zxvf jdk-8u162-linux-x64.tar.gz
-
-cat >> /etc/profile << EOF
-
-export JAVA_HOME=/opt/java/jdk1.8.0_162
-export PATH=\$JAVA_HOME/bin:\$PATH
-export CLASSPATH=.:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib/tools.jar
-EOF
-source /etc/profile

codes/deploy/tool/kafka/README.md

@@ -1,9 +0,0 @@
-# 安装 Kafka
-
-使用方法：
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/kafka/install-kafka.sh | bash
-```
-
-脚本会下载解压 kafka 到 `/opt/kafka` 路径下。

codes/deploy/tool/mongodb/README.md

@@ -1,9 +0,0 @@
-# 安装 mongodb
-
-使用方法：
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/mongodb/install-mongodb.sh | bash
-```
-
-脚本会下载解压 redis 到 `/opt/mongodb` 路径下。

codes/deploy/tool/nginx/README.md

@@ -1,20 +0,0 @@
-# 安装 Nginx
-
-## linux 安装 nginx 通用脚本
-
-使用方法：
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/nginx/install-nginx.sh | bash
-```
-
-脚本会下载解压 nginx 到 `/opt/nginx` 路径下。
-
-## Centos 安装 nginx 脚本
-
-使用方法：
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/nginx/install-nginx-by-yum.sh | bash
-```
-

codes/deploy/tool/nodejs/README.md

@@ -1,7 +0,0 @@
-# 安装 Nodejs
-
-使用方法：
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/nodejs/install-nodejs.sh | bash
-```

codes/deploy/tool/redis/README.md

@@ -1,9 +0,0 @@
-# 安装 Redis
-
-使用方法：
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/redis/install-redis.sh | bash
-```
-
-脚本会下载解压 redis 到 `/opt/redis` 路径下。

codes/deploy/tool/rocketmq/README.md

@@ -1,9 +0,0 @@
-# 安装 RocketMQ
-
-使用方法：
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/rocketmq/install-rocketmq.sh | bash
-```
-
-脚本会下载解压 RocketMQ 到 `/opt/rocketmq` 路径下。

codes/deploy/tool/tomcat/README.md

@@ -1,15 +0,0 @@
-# 安装 Tomcat
-
-## 安装 Tomcat8
-
-使用方法：
-
-```sh
-wget --no-check-certificate --no-cookies https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/tomcat/install-tomcat8.sh
-chmod -R 777 install-tomcat8.sh
-./install-tomcat8.sh
-
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/tomcat/install-tomcat8.sh | bash
-```
-
-脚本会下载解压 tomcat 到 `/opt/tomcat` 路径下。

codes/deploy/tool/zookeeper/README.md

@@ -1,9 +0,0 @@
-# 安装 ZooKeeper
-
-使用方法：
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/zookeeper/install-zookeeper.sh | bash
-```
-
-脚本会下载解压 zookeeper 到 `/opt/zookeeper` 路径下。

codes/linux/README.md

@@ -19,8 +19,4 @@ $ chmod -R 777 *
 $ ./main.sh
 ```
 
-**示例图**
-
-![deploy.gif](images/deploy.gif)
-
 > 注意：上图仅作参考，由于不定期更新，请以实际展示UI为准。

codes/linux/main.sh

@@ -26,13 +26,13 @@ function checkOsVersion(){
   if(($1 == 1))
   then
     platform=`uname -i`
-    if [ $platform != "x86_64" ];then
+    if [[ ${platform} != "x86_64" ]];then
     echo "this script is only for 64bit Operating System !"
     exit 1
     fi
     echo "the platform is ok"
     version=`lsb_release -r |awk '{print substr($2,1,1)}'`
-    if [ $version != 6 ];then
+    if [[ ${version} != 6 ]];then
     echo "this script is only for CentOS 6 !"
     exit 1
     fi
@@ -77,22 +77,22 @@ function chooseOper() {
       libs ) ${filepath}/lib/install-libs.sh;;
 
       # 2 - Common Tools
-      2 | tools ) ${filepath}/tool/install-all.sh;;
+      2 | tools ) ${filepath}/ops/service/install-all.sh;;
-      git ) ${filepath}/tool/git/install-git.sh;;
+      git ) ${filepath}/ops/service/git/install-git.sh;;
-      svn ) ${filepath}/tool/svn/install-svn.sh;;
+      svn ) ${filepath}/ops/service/svn/install-svn.sh;;
-      jdk8 ) ${filepath}/tool/jdk/install-jdk8.sh;;
+      jdk8 ) ${filepath}/ops/service/jdk/install-jdk8.sh;;
-      maven ) ${filepath}/tool/maven/install-maven3.sh;;
+      maven ) ${filepath}/ops/service/maven/install-maven3.sh;;
-      nginx ) ${filepath}/tool/nginx/install-nginx.sh;;
+      nginx ) ${filepath}/ops/service/nginx/install-nginx.sh;;
-      nodejs ) ${filepath}/tool/nodejs/install-nodejs.sh;;
+      nodejs ) ${filepath}/ops/service/nodejs/install-nodejs.sh;;
-      tomcat ) ${filepath}/tool/tomcat/install-tomcat8.sh;;
+      tomcat ) ${filepath}/ops/service/tomcat/install-tomcat8.sh;;
-      elk ) ${filepath}/tool/elk/install-elk.sh;;
+      elk ) ${filepath}/ops/service/elk/install-elk.sh;;
-      redis ) ${filepath}/tool/redis/install-redis.sh;;
+      redis ) ${filepath}/ops/service/redis/install-redis.sh;;
-      mongodb ) ${filepath}/tool/mongodb/install-mongodb.sh;;
+      mongodb ) ${filepath}/ops/service/mongodb/install-mongodb.sh;;
-      kafka ) ${filepath}/tool/kafka/install-kafka.sh;;
+      kafka ) ${filepath}/ops/service/kafka/install-kafka.sh;;
 
       # 3 - Recommended Tools
-      sdk ) ${filepath}/tool/sdk/install-sdk.sh;;
+      sdk ) ${filepath}/ops/service/sdk/install-sdk.sh;;
-      springboot ) ${filepath}/tool/springboot/install-springboot.sh;;
+      springboot ) ${filepath}/ops/service/springboot/install-springboot.sh;;
 
       * ) echo "${key} is invalid key";;
     esac

codes/linux/ops/service/elk/install-elk.sh

@@ -91,7 +91,7 @@ replaceLogstashConfig() {
   sed -i "s/# http.host: \"127.0.0.1\"/ http.host: ${IP}/g" ${ELASTIC_SOFTWARE_PATH}/logstash-${version}/config/logstash.yml
   touch ${ELASTIC_SOFTWARE_PATH}/logstash-${version}/bin/nohup.out
   cd ${ELASTIC_SOFTWARE_PATH}/logstash-${version}/bin
-  wget "https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/elk/config/logstash.conf"
+  wget "https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/elk/config/logstash.conf"
 }
 
 # 替换 Kibana 配置
@@ -140,6 +140,6 @@ replaceFilebeatConfig
 
 # 最后，将启动脚本下载到本地
 mkdir -p /home/zp/script
-wget -P /home/zp/script "https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/elk/boot-elk.sh"
+wget -P /home/zp/script "https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/elk/boot-elk.sh"
 #setPrivilegeForUser
 

codes/linux/ops/service/jdk/README.md

@@ -0,0 +1,8 @@
+# 安装 JDK
+
+使用方法：
+
+```sh
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/jdk/install-jdk8.sh | bash
+```
+脚本会下载解压 jdk8 到 `/usr/lib/jvm/java` 路径下。

codes/linux/ops/service/jdk/install-jdk8.sh

@@ -9,12 +9,5 @@
 
 echo -e "\n>>>>>>>>> install jdk8"
 
-yum -y install java-1.8.0-openjdk-devel-debug.x86_64
+yum -y install java-1.8.0-openjdk.x86_64
-
+yum -y install java-1.8.0-openjdk-devel.x86_64
-cat >> /etc/profile << EOF
-
-export JAVA_HOME=/usr/lib/jvm/java
-export PATH=\$JAVA_HOME/bin:\$PATH
-export CLASSPATH=.:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib/tools.jar
-EOF
-source /etc/profile

codes/linux/ops/service/jenkins/README.md

@@ -5,7 +5,7 @@
 使用方法：
 
 ```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/jenkins/install-jenkins.sh | bash
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/jenkins/install-jenkins.sh | bash
 ```
 
 脚本会下载解压 Jenkins 到 `/opt/jenkins` 路径下。

codes/linux/ops/service/kafka/README.md

@@ -0,0 +1,9 @@
+# 安装 Kafka
+
+使用方法：
+
+```sh
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/kafka/install-kafka.sh | bash
+```
+
+脚本会下载解压 kafka 到 `/opt/kafka` 路径下。

codes/linux/ops/service/maven/README.md

@@ -3,7 +3,7 @@
 使用方法：
 
 ```sh
-curl -o- https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/tool/maven/install-maven3.sh | bash
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/maven/install-maven3.sh | bash
 ```
 
 脚本会下载解压 maven 到 `/opt/maven` 路径下。

codes/linux/ops/service/mongodb/README.md

@@ -0,0 +1,9 @@
+# 安装 mongodb
+
+使用方法：
+
+```sh
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/mongodb/install-mongodb.sh | bash
+```
+
+脚本会下载解压 redis 到 `/opt/mongodb` 路径下。

codes/linux/ops/service/nginx/README.md

@@ -0,0 +1,20 @@
+# 安装 Nginx
+
+## linux 安装 nginx 通用脚本
+
+使用方法：
+
+```sh
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/nginx/install-nginx.sh | bash
+```
+
+脚本会下载解压 nginx 到 `/opt/nginx` 路径下。
+
+## Centos 安装 nginx 脚本
+
+使用方法：
+
+```sh
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/nginx/install-nginx-by-yum.sh | bash
+```
+

codes/linux/ops/service/nginx/install-nginx.sh

@@ -14,7 +14,7 @@ echo -e "\n>>>>>>>>> install nginx"
 # 首先要安装 PCRE，PCRE 作用是让 nginx 支持 Rewrite 功能
 pcreRoot=/opt/pcre
 pcreVersion=8.35
-./install-pcre.sh ${pcreRoot} ${pcreVersion}
+install-pcre.sh ${pcreRoot} ${pcreVersion}
 
 # 下载并解压 nginx
 ngixnRoot=/opt/nginx

codes/linux/ops/service/nodejs/README.md

@@ -0,0 +1,7 @@
+# 安装 Nodejs
+
+使用方法：
+
+```sh
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/nodejs/install-nodejs.sh | bash
+```

codes/linux/ops/service/redis/README.md

@@ -0,0 +1,9 @@
+# 安装 Redis
+
+使用方法：
+
+```sh
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/redis/install-redis.sh | bash
+```
+
+脚本会下载解压 redis 到 `/opt/redis` 路径下。

codes/linux/ops/service/rocketmq/README.md

@@ -0,0 +1,9 @@
+# 安装 RocketMQ
+
+使用方法：
+
+```sh
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/rocketmq/install-rocketmq.sh | bash
+```
+
+脚本会下载解压 RocketMQ 到 `/opt/rocketmq` 路径下。

codes/linux/ops/service/tomcat/README.md

@@ -0,0 +1,15 @@
+# 安装 Tomcat
+
+## 安装 Tomcat8
+
+使用方法：
+
+```sh
+wget --no-check-certificate --no-cookies https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/tomcat/install-tomcat8.sh
+chmod -R 777 install-tomcat8.sh
+./install-tomcat8.sh
+
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/tomcat/install-tomcat8.sh | bash
+```
+
+脚本会下载解压 tomcat 到 `/opt/tomcat` 路径下。

codes/linux/ops/service/zookeeper/README.md

@@ -0,0 +1,9 @@
+# 安装 ZooKeeper
+
+使用方法：
+
+```sh
+curl -o- https://github.com/dunwu/os-tutorial/blob/master/codes/linux/ops/service/zookeeper/install-zookeeper.sh | bash
+```
+
+脚本会下载解压 zookeeper 到 `/opt/zookeeper` 路径下。

codes/linux/sys/yum/change-yum-repo.sh

@@ -18,7 +18,7 @@ version=`cat /etc/redhat-release | awk '{print substr($4,1,1)}'`
 # 根据发型版本选择相应 yum 镜像
 if [ ${version} == 5 ]; then
   # Cento5 已废弃，只能使用 http://vault.centos.org/ 替换，但由于是国外镜像，速度较慢
-  wget --no-cookie --no-check-certificate -O /etc/yum.repos.d/CentOS-Base.repo https://raw.githubusercontent.com/dunwu/OS/master/codes/deploy/sys/yum/CentOS-Base.repo
+  wget --no-cookie --no-check-certificate -O /etc/yum.repos.d/CentOS-Base.repo https://github.com/dunwu/os-tutorial/master/codes/deploy/sys/yum/CentOS-Base.repo
 
   # 根据实际发型版本情况替换
   detailVersion=`lsb_release -r | awk '{print substr($2,1,3)}'`