Merge branch 'feature-mkdocs'

Document-Collection · Dec 19, 2019 · 4df2188 · 4df2188
2 parents 2882402 + 396df7e
commit 4df2188
Show file tree

Hide file tree

Showing 76 changed files with 814 additions and 214 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+.vscode
+
 node_modules/
 
 docs/build/*
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/source/basic/DNS解析过程.md → docs/basic/DNS解析过程.md b/docs/source/basic/DNS解析过程.md → docs/basic/DNS解析过程.md
diff --git a/docs/source/basic/URL构成.md → docs/basic/URL构成.md b/docs/source/basic/URL构成.md → docs/basic/URL构成.md
diff --git a/docs/source/basic/imgs/OSI.PNG → docs/basic/imgs/OSI.PNG b/docs/source/basic/imgs/OSI.PNG → docs/basic/imgs/OSI.PNG
diff --git a/...rce/basic/imgs/URI_syntax_diagram.svg.png → docs/basic/imgs/URI_syntax_diagram.svg.png b/...rce/basic/imgs/URI_syntax_diagram.svg.png → docs/basic/imgs/URI_syntax_diagram.svg.png
diff --git a/docs/source/basic/imgs/device-structure.PNG → docs/basic/imgs/device-structure.PNG b/docs/source/basic/imgs/device-structure.PNG → docs/basic/imgs/device-structure.PNG
diff --git a/docs/source/basic/imgs/ip-address.PNG → docs/basic/imgs/ip-address.PNG b/docs/source/basic/imgs/ip-address.PNG → docs/basic/imgs/ip-address.PNG
diff --git a/docs/source/basic/imgs/network-scope.PNG → docs/basic/imgs/network-scope.PNG b/docs/source/basic/imgs/network-scope.PNG → docs/basic/imgs/network-scope.PNG
diff --git a/docs/source/basic/imgs/osi-tcp-ip.PNG → docs/basic/imgs/osi-tcp-ip.PNG b/docs/source/basic/imgs/osi-tcp-ip.PNG → docs/basic/imgs/osi-tcp-ip.PNG
diff --git a/docs/source/basic/imgs/tcp-ip.PNG → docs/basic/imgs/tcp-ip.PNG b/docs/source/basic/imgs/tcp-ip.PNG → docs/basic/imgs/tcp-ip.PNG
diff --git a/docs/source/basic/ip地址.md → docs/basic/ip地址.md b/docs/source/basic/ip地址.md → docs/basic/ip地址.md
diff --git a/docs/source/basic/局域网、广域网、互联网和私有专用网.md → docs/basic/局域网、广域网、互联网和私有专用网.md b/docs/source/basic/局域网、广域网、互联网和私有专用网.md → docs/basic/局域网、广域网、互联网和私有专用网.md
diff --git a/docs/source/basic/私有地址.md → docs/basic/私有地址.md b/docs/source/basic/私有地址.md → docs/basic/私有地址.md
diff --git a/docs/source/basic/网络体系结构.md → docs/basic/网络体系结构.md b/docs/source/basic/网络体系结构.md → docs/basic/网络体系结构.md
diff --git a/docs/source/basic/路由器、交换机、集线器、中继器.md → docs/basic/路由器、交换机、集线器、中继器.md b/docs/source/basic/路由器、交换机、集线器、中继器.md → docs/basic/路由器、交换机、集线器、中继器.md
@@ -17,7 +17,7 @@
 
 参考：[交换机](https://baike.baidu.com/item/%E4%BA%A4%E6%8D%A2%E6%9C%BA)
 
-交换机（`Switch`）作用于数据链路层，通过MAC地址为接入交换机的任意两个节点提供独享的电信号通路，通常分为广域网交换机和局域网交换机
+交换机（`Switch`）作用于数据链路层，通过`MAC`地址为接入交换机的任意两个节点提供独享的电信号通路，通常分为广域网交换机和局域网交换机
 
 ## 集线器
 

diff --git a/docs/index.md b/docs/index.md
@@ -0,0 +1,10 @@
+
+# 引言
+
+学习计算机网络基础知识以及相关工具使用
+
+* [基础知识](./basic/ip地址.md)
+* [内网穿透](./net-traversal/前言.md)
+* [Nginx使用](./nginx/安装.md)
+* [Tomcat使用](./tomcat/关于Tomcat.md)
+* [SSH使用](./ssh/[SSH]远程连接.md)
diff --git a/docs/make.bat b/docs/make.bat
diff --git a/.../source/net-traversal/[内网穿透][路由器]虚拟服务器.md → docs/net-traversal/[内网穿透][路由器]虚拟服务器.md b/.../source/net-traversal/[内网穿透][路由器]虚拟服务器.md → docs/net-traversal/[内网穿透][路由器]虚拟服务器.md
diff --git a/docs/source/net-traversal/[内网穿透]n2n原理.md → docs/net-traversal/[内网穿透]n2n原理.md b/docs/source/net-traversal/[内网穿透]n2n原理.md → docs/net-traversal/[内网穿透]n2n原理.md
diff --git a/docs/source/net-traversal/[内网穿透]n2n实现.md → docs/net-traversal/[内网穿透]n2n实现.md b/docs/source/net-traversal/[内网穿透]n2n实现.md → docs/net-traversal/[内网穿透]n2n实现.md
diff --git a/docs/source/net-traversal/[内网穿透]ngrok实现.md → docs/net-traversal/[内网穿透]ngrok实现.md b/docs/source/net-traversal/[内网穿透]ngrok实现.md → docs/net-traversal/[内网穿透]ngrok实现.md
diff --git a/docs/source/net-traversal/[内网穿透]花生壳.md → docs/net-traversal/[内网穿透]花生壳.md b/docs/source/net-traversal/[内网穿透]花生壳.md → docs/net-traversal/[内网穿透]花生壳.md
diff --git a/docs/source/net-traversal/imgs/n2n_com.png → docs/net-traversal/imgs/n2n_com.png b/docs/source/net-traversal/imgs/n2n_com.png → docs/net-traversal/imgs/n2n_com.png
diff --git a/docs/source/net-traversal/imgs/n2n_nat.png → docs/net-traversal/imgs/n2n_nat.png b/docs/source/net-traversal/imgs/n2n_nat.png → docs/net-traversal/imgs/n2n_nat.png
diff --git a/...source/net-traversal/imgs/n2n_network.png → docs/net-traversal/imgs/n2n_network.png b/...source/net-traversal/imgs/n2n_network.png → docs/net-traversal/imgs/n2n_network.png
diff --git a/docs/source/net-traversal/imgs/ngrok.png → docs/net-traversal/imgs/ngrok.png b/docs/source/net-traversal/imgs/ngrok.png → docs/net-traversal/imgs/ngrok.png
diff --git a/...ource/net-traversal/imgs/ngrok_online.png → docs/net-traversal/imgs/ngrok_online.png b/...ource/net-traversal/imgs/ngrok_online.png → docs/net-traversal/imgs/ngrok_online.png
diff --git a/...urce/net-traversal/imgs/ngrok_online2.png → docs/net-traversal/imgs/ngrok_online2.png b/...urce/net-traversal/imgs/ngrok_online2.png → docs/net-traversal/imgs/ngrok_online2.png
diff --git a/.../source/net-traversal/imgs/oray-login.png → docs/net-traversal/imgs/oray-login.png b/.../source/net-traversal/imgs/oray-login.png → docs/net-traversal/imgs/oray-login.png
diff --git a/...ource/net-traversal/imgs/port-setting.png → docs/net-traversal/imgs/port-setting.png b/...ource/net-traversal/imgs/port-setting.png → docs/net-traversal/imgs/port-setting.png
diff --git a/...-traversal/imgs/router-visual-setting.png → ...-traversal/imgs/router-visual-setting.png b/...-traversal/imgs/router-visual-setting.png → ...-traversal/imgs/router-visual-setting.png
diff --git a/...rce/net-traversal/imgs/switch-account.png → docs/net-traversal/imgs/switch-account.png b/...rce/net-traversal/imgs/switch-account.png → docs/net-traversal/imgs/switch-account.png
diff --git a/...rce/net-traversal/imgs/tunnels_online.png → docs/net-traversal/imgs/tunnels_online.png b/...rce/net-traversal/imgs/tunnels_online.png → docs/net-traversal/imgs/tunnels_online.png
diff --git a/docs/source/net-traversal/前言.md → docs/net-traversal/前言.md b/docs/source/net-traversal/前言.md → docs/net-traversal/前言.md
diff --git a/...urce/nginx/[Ubuntu 16.04]docker安装nginx.md → docs/nginx/docker安装nginx.md b/...urce/nginx/[Ubuntu 16.04]docker安装nginx.md → docs/nginx/docker安装nginx.md
@@ -1,5 +1,5 @@
 
-# [Ubuntu 16.04]docker安装nginx
+# docker安装nginx
 
 主要参考[Docker 安装 Nginx](https://www.runoob.com/docker/docker-install-nginx.html)完成`nginx`的安装和配置
 

diff --git a/docs/source/nginx/imgs/aliyun-ca.png → docs/nginx/imgs/aliyun-ca.png b/docs/source/nginx/imgs/aliyun-ca.png → docs/nginx/imgs/aliyun-ca.png
diff --git a/docs/source/nginx/imgs/first-index.png → docs/nginx/imgs/first-index.png b/docs/source/nginx/imgs/first-index.png → docs/nginx/imgs/first-index.png
diff --git a/docs/source/nginx/imgs/hello-nginx.png → docs/nginx/imgs/hello-nginx.png b/docs/source/nginx/imgs/hello-nginx.png → docs/nginx/imgs/hello-nginx.png
diff --git a/docs/source/nginx/imgs/nginx-jenkins.png → docs/nginx/imgs/nginx-jenkins.png b/docs/source/nginx/imgs/nginx-jenkins.png → docs/nginx/imgs/nginx-jenkins.png
diff --git a/docs/source/nginx/imgs/purchased-ca.png → docs/nginx/imgs/purchased-ca.png b/docs/source/nginx/imgs/purchased-ca.png → docs/nginx/imgs/purchased-ca.png
diff --git a/docs/nginx/imgs/reverse_proxy.png b/docs/nginx/imgs/reverse_proxy.png
diff --git a/docs/source/nginx/imgs/welcome-nginx.png → docs/nginx/imgs/welcome-nginx.png b/docs/source/nginx/imgs/welcome-nginx.png → docs/nginx/imgs/welcome-nginx.png
diff --git a/docs/source/nginx/imgs/welcome_nginx.png → docs/nginx/imgs/welcome_nginx.png b/docs/source/nginx/imgs/welcome_nginx.png → docs/nginx/imgs/welcome_nginx.png
diff --git a/docs/source/nginx/[Ubuntu 16.04]nginx中文乱码.md → docs/nginx/中文乱码.md b/docs/source/nginx/[Ubuntu 16.04]nginx中文乱码.md → docs/nginx/中文乱码.md
@@ -1,5 +1,5 @@
 
-# [Ubuntu 16.04]nginx中文乱码
+# 中文乱码
 
 参考：
 

diff --git a/docs/source/nginx/[Ubuntu 16.04]nginx反向代理.md → docs/nginx/反向代理.md b/docs/source/nginx/[Ubuntu 16.04]nginx反向代理.md → docs/nginx/反向代理.md
@@ -1,13 +1,13 @@
 
-# [Ubuntu 16.04]nginx反向代理
+# 反向代理
 
 ## 反向代理简介
 
 参考：[Nginx Reverse Proxy](https://www.jianshu.com/p/b1debd31149b)
 
 反向代理（`reverse proxy`）用于代理服务器，用户输入代理服务器地址，通过`nginx`请求正确的服务器地址，并将资源返回给用户
 
-![](https://upload-images.jianshu.io/upload_images/5107794-9c9764e76dfa7b2d.png?imageMogr2/auto-orient/strip|imageView2/2/w/1030/format/webp)
+![](./imgs/reverse_proxy.png)
 
 ## 配置
 

diff --git a/docs/source/nginx/[Ubuntu 16.04]nginx安装.md → docs/nginx/安装.md b/docs/source/nginx/[Ubuntu 16.04]nginx安装.md → docs/nginx/安装.md
@@ -1,5 +1,5 @@
 
-# [Ubuntu 16.04]nginx安装
+# 安装
 
 参考：[Installing nginx](http://nginx.org/en/docs/install.html)
 

diff --git a/...source/nginx/[Ubuntu 16.04]nginx托管静态网站.md → docs/nginx/托管网站.md b/...source/nginx/[Ubuntu 16.04]nginx托管静态网站.md → docs/nginx/托管网站.md
@@ -1,5 +1,5 @@
 
-# [Ubuntu 16.04]nginx托管静态网站
+# 托管网站
 
 参考：
 

diff --git a/docs/source/nginx/[Ubuntu 16.04]nginx测试.md → docs/nginx/测试.md b/docs/source/nginx/[Ubuntu 16.04]nginx测试.md → docs/nginx/测试.md
@@ -1,5 +1,5 @@
 
-# [Ubuntu 16.04]nginx测试
+# 测试
 
 参考：
 

diff --git a/docs/source/nginx/[Ubuntu 16.04]nginx配置.md → docs/nginx/配置.md b/docs/source/nginx/[Ubuntu 16.04]nginx配置.md → docs/nginx/配置.md
@@ -1,5 +1,5 @@
 
-# [Ubuntu 16.04]nginx配置
+# 配置
 
 ## nginx相关
 

diff --git a/...ource/nginx/[Ubuntu 16.04]nginx配置HTTPS.md → docs/nginx/配置Https.md b/...ource/nginx/[Ubuntu 16.04]nginx配置HTTPS.md → docs/nginx/配置Https.md
@@ -1,5 +1,5 @@
 
-# [Ubuntu 16.04]nginx配置HTTPS
+# 配置Https
 
 参考：
 

diff --git a/docs/source/basic.rst b/docs/source/basic.rst
diff --git a/docs/source/conf.py b/docs/source/conf.py
diff --git a/docs/source/index.rst b/docs/source/index.rst
diff --git a/docs/source/net-traversal.rst b/docs/source/net-traversal.rst
diff --git a/docs/source/nginx.rst b/docs/source/nginx.rst
diff --git a/docs/source/tomcat.rst b/docs/source/tomcat.rst
diff --git a/docs/ssh/Bad owner or permissions on .ssh config.md b/docs/ssh/Bad owner or permissions on .ssh config.md
@@ -0,0 +1,23 @@
+
+# Bad owner or permissions on .ssh config
+
+## 问题复现
+
+```
+$ git push origin dev 
+Bad owner or permissions on /home/zj/.ssh/config
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+```
+
+## 问题解决
+
+参考：[Bad owner or permissions on .ssh/config的解决](https://blog.csdn.net/zcc_heu/article/details/79017606)
+
+设置`config`文件权限为`600`即可
+
+```
+$ chmod 600 config 
+```