Skip to content

Commit 6ab987a

Browse files
dunwudunwu
committed
update
1 parent eff3b92 commit 6ab987a

39 files changed

+987
-1637
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ root = true
1010
[*]
1111
end_of_line = lf
1212
indent_size = 2
13-
indent_style = tab
13+
indent_style = space
1414
max_line_length = 120
1515
charset = utf-8
1616
trim_trailing_whitespace = true
@@ -19,7 +19,7 @@ insert_final_newline = true
1919
[*.{bat, cmd}]
2020
end_of_line = crlf
2121

22-
[*.{java, groovy, kt, sh}]
22+
[*.{java, gradle, groovy, kt, sh}]
2323
indent_size = 4
2424

2525
[*.md]

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ hs_err_pid*
2929

3030
# maven plugin temp files
3131
.flattened-pom.xml
32+
package-lock.json
3233

3334

3435
# ------------------------------- javascript -------------------------------
@@ -47,6 +48,7 @@ npm-debug.log*
4748
yarn-debug.log*
4849
yarn-error.log*
4950
bundle*.js
51+
book.pdf
5052

5153

5254
# ------------------------------- intellij -------------------------------

‎README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
<img src="https://badgen.net/github/license/dunwu/linux-tutorial" alt="license">
99
</p>
1010

11-
<h1 align="center">Linux Tutorial</h1>
11+
<h1 align="center">linux-tutorial</h1>
12+
1213
> 🔁 项目同步维护在 [github](https://github.com/dunwu/linux-tutorial) | [gitee](https://gitee.com/turnon/linux-tutorial)
1314
>
1415
> 📖 [电子书](https://dunwu.github.io/linux-tutorial/) | [电子书（国内）](http://turnon.gitee.io/linux-tutorial/)
@@ -68,15 +69,16 @@
6869
- [Nacos 运维](docs/linux/soft/nacos-install.md)
6970
- 服务器
7071
- [Nginx 教程 📚](https://github.com/dunwu/nginx-tutorial)
71-
- [Tomcat 运维](linux/soft/tomcat-install.md)
72+
- [Tomcat 运维](docs/linux/soft/tomcat-install.md)
7273
- [数据库 📚](https://github.com/dunwu/db-tutorial)
7374
- [Mysql 运维](https://github.com/dunwu/db-tutorial/blob/master/docs/sql/mysql/mysql-ops.md)
7475
- [Redis 运维](https://github.com/dunwu/db-tutorial/blob/master/docs/nosql/redis/redis-ops.md)
7576

7677
### 扩展
7778

78-
- [Docker 教程](docs/docker)
79-
- [Docker 应用指南](docs/docker/docker.md)
79+
- [Docker 教程](docs/docker/README.md)
80+
- [Docker 快速入门](docs/docker/docker-quickstart.md)
81+
- [Dockerfile 最佳实践](docs/docker/docker-dockerfile.md)
8082
- [Docker Cheat Sheet](docs/docker/docker-cheat-sheet.md)
8183
- [一篇文章让你彻底掌握 Python](https://github.com/dunwu/blog/blob/master/source/_posts/coding/python.md)
8284
- [一篇文章让你彻底掌握 Shell](https://github.com/dunwu/blog/blob/master/source/_posts/coding/shell.md)

‎codes/linux/soft/maven-install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ $# -lt 1 ]] || [[ $# -lt 2 ]]; then
4040
printf "${RESET}\n"
4141
fi
4242

43-
version=3.6.2
43+
version=3.5.4
4444
if [[ -n $1 ]]; then
4545
version=$1
4646
fi
@@ -58,7 +58,7 @@ printf "${RESET}\n"
5858

5959
# download and decompression
6060
mkdir -p ${path}
61-
wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" -O ${path}/apache-maven-${version}-bin.tar.gz http://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz
61+
wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" -O ${path}/apache-maven-${version}-bin.tar.gz http://apache.01link.hk/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz
6262
tar -zxvf ${path}/apache-maven-${version}-bin.tar.gz -C ${path}
6363

6464
# setting env

‎codes/shell/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@
66
>
77
> - 你想要执行某个操作，却不知 Shell 命令如何写
88
> - 你想要快速掌握 Shell 基本用法
9+
10+
## 参考资料
11+
12+
- [pure-bash-bible](https://github.com/dylanaraps/pure-bash-bible#change-a-string-to-lowercase)

‎docs/README.md‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
1-
<p align="center">
2-
<a href="https://spring.io/projects/spring-boot" target="_blank" rel="noopener noreferrer">
3-
<img src="http://dunwu.test.upcdn.net/common/logo/linux.svg" alt="logo" width="100px">
4-
</a>
5-
</p>
6-
7-
<p align="center">
8-
<img src="https://badgen.net/github/license/dunwu/linux-tutorial" alt="license">
9-
</p>
10-
11-
<h1 align="center">Linux Tutorial</h1>
1+
# linux-tutorial
122

133
> 🔁 项目同步维护在 [github](https://github.com/dunwu/linux-tutorial) | [gitee](https://gitee.com/turnon/linux-tutorial)
144
>
@@ -38,11 +28,12 @@
3828

3929
> Linux 系统的常见运维工作。
4030
41-
- [linux 典型运维应用](linux/ops/linux典型运维应用.md)
42-
- [samba 使用详解](linux/ops/samba.md)
43-
- [Systemd 教程](linux/ops/systemd.md)
44-
- [Vim 应用指南](linux/ops/vim.md)
45-
- [Zsh 应用指南](linux/ops/zsh.md)
31+
- [linux 典型运维应用](linux/ops/linux典型运维应用.md) - 关键词：域名解析、防火墙、网卡、NTP、crontab
32+
- [Samba 应用](linux/ops/samba.md)
33+
- [Systemd 应用](linux/ops/systemd.md)
34+
- [Vim 应用](linux/ops/vim.md)
35+
- [Iptables 应用](linux/ops/iptables.md)
36+
- [oh-my-zsh 应用](linux/ops/zsh.md)
4637

4738
### 软件运维
4839

@@ -75,8 +66,9 @@
7566

7667
### 扩展
7768

78-
- [Docker 教程](docker)
79-
- [Docker 应用指南](docker/docker.md)
69+
- [Docker 教程](docker/README.md)
70+
- [Docker 快速入门](docker/docker-quickstart.md)
71+
- [Dockerfile 最佳实践](docker/docker-dockerfile.md)
8072
- [Docker Cheat Sheet](docker/docker-cheat-sheet.md)
8173
- [一篇文章让你彻底掌握 Python](https://github.com/dunwu/blog/blob/master/source/_posts/coding/python.md)
8274
- [一篇文章让你彻底掌握 Shell](https://github.com/dunwu/blog/blob/master/source/_posts/coding/shell.md)
@@ -100,7 +92,7 @@
10092

10193
- **Linux 命令**
10294
- [命令行的艺术](https://github.com/jlevy/the-art-of-command-line/blob/master/README-zh.md)
103-
- [Linux命令大全](https://man.linuxde.net/)
95+
- [Linux 命令大全](https://man.linuxde.net/)
10496
- [linux-command](https://github.com/jaywcjlove/linux-command)
10597
- **社区网站**
10698
- [Linux 中国](https://linux.cn/) - 各种资讯、文章、技术

‎docs/book.json‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
{
2+
"gitbook": "3.2.2",
3+
"title": "linux-tutorial",
4+
"language": "zh-hans",
5+
"root": "./",
6+
"structure": {
7+
"summary": "sidebar.md"
8+
},
9+
"links": {
10+
"sidebar": {
11+
"linux-tutorial": "https://github.com/dunwu/linux-tutorial"
12+
}
13+
},
14+
"plugins": [
15+
"-lunr",
16+
"-search",
17+
"advanced-emoji@^0.2.2",
18+
"anchor-navigation-ex@1.0.10",
19+
"anchors@^0.7.1",
20+
"edit-link@^2.0.2",
21+
"expandable-chapters-small@^0.1.7",
22+
"github@^2.0.0",
23+
"search-plus@^0.0.11",
24+
"simple-page-toc@^0.1.1",
25+
"splitter@^0.0.8",
26+
"tbfed-pagefooter@^0.0.1"
27+
],
28+
"pluginsConfig": {
29+
"anchor-navigation-ex": {
30+
"showLevel": false,
31+
"associatedWithSummary": true,
32+
"multipleH1": true,
33+
"mode": "float",
34+
"isRewritePageTitle": false,
35+
"float": {
36+
"showLevelIcon": false,
37+
"level1Icon": "fa fa-hand-o-right",
38+
"level2Icon": "fa fa-hand-o-right",
39+
"level3Icon": "fa fa-hand-o-right"
40+
},
41+
"pageTop": {
42+
"showLevelIcon": false,
43+
"level1Icon": "fa fa-hand-o-right",
44+
"level2Icon": "fa fa-hand-o-right",
45+
"level3Icon": "fa fa-hand-o-right"
46+
}
47+
},
48+
"edit-link": {
49+
"base": "https://github.com/dunwu/linux-tutorial/blob/master/docs",
50+
"label": "编辑此页面"
51+
},
52+
"github": {
53+
"url": "https://github.com/dunwu"
54+
},
55+
"simple-page-toc": {
56+
"maxDepth": 4,
57+
"skipFirstH1": true
58+
},
59+
"sharing": {
60+
"weibo": true,
61+
"all": [
62+
"weibo"
63+
]
64+
},
65+
"tbfed-pagefooter": {
66+
"copyright": "Copyright © Zhang Peng 2017",
67+
"modify_label": "该文件上次修订时间：",
68+
"modify_format": "YYYY-MM-DD HH:mm:ss"
69+
}
70+
}
71+
}

‎docs/docker/README.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,28 @@
11
# Docker 教程
2+
3+
- [Docker 快速入门](docker-quickstart.md)
4+
- [Dockerfile 最佳实践](docker-dockerfile.md)
5+
- [Docker Cheat Sheet](docker-cheat-sheet.md)
6+
7+
## 资源
8+
9+
- **官方**
10+
- [Docker 官网](http://www.docker.com)
11+
- [Docker Github](https://github.com/moby/moby)
12+
- [Docker 官方文档](https://docs.docker.com/)
13+
- [Docker Hub](https://hub.docker.com/)
14+
- [Docker 开源](https://www.docker.com/community/open-source)
15+
- **资源整理**
16+
- [Awesome Docker](https://github.com/veggiemonk/awesome-docker)
17+
- **教程**
18+
- [Docker — 从入门到实践](https://github.com/yeasy/docker_practice) - 非常详尽的 Docker 中文教程
19+
- [Docker 中文网站](https://www.docker-cn.com/)
20+
- [Docker 安装手册](https://docs.docker-cn.com/engine/installation/)
21+
- **镜像**
22+
- [时速云镜像仓库](https://hub.tenxcloud.com/)
23+
- [网易云镜像服务](https://c.163.com/hub#/m/library/)
24+
- [DaoCloud 镜像市场](https://hub.daocloud.io/)
25+
- [阿里云镜像库](https://cr.console.aliyun.com/)
26+
- **文章**
27+
- [Docker 入门教程](http://www.ruanyifeng.com/blog/2018/02/docker-tutorial.html)
28+
- [Docker Cheat Sheet](https://github.com/wsargent/docker-cheat-sheet/tree/master/zh-cn)

‎docs/docker/advanced/docker-design.md‎

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)