Skip to content

[pull] master from netkiller:master #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2025
Merged

[pull] master from netkiller:master #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion linux/apas02.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/apas05.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/apas07.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/apas08.html
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions linux/appendix.html
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions linux/ch114s02.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/ch118.html
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions linux/communication.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/computing/boinc.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/computing/boinccmd.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
--network_available
--get_cc_status
</pre>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1913"></a>85.4.1. attach_project</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1917"></a>85.4.1. attach_project</h3></div></div></div>

<p>添加计算项目</p>
<pre class="screen">
Expand All @@ -65,7 +65,7 @@
./boinccmd --project_attach http://boinc.bakerlab.org/rosetta/ 6ed4722aa62a9df5dd341e0b3b77d812
</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1914"></a>85.4.2. nomorework | allowmorework 禁止下载任务 / 允许下载任务</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1918"></a>85.4.2. nomorework | allowmorework 禁止下载任务 / 允许下载任务</h3></div></div></div>

<pre class="screen">
./boinccmd --project http://boinc.bakerlab.org/rosetta/ nomorework
Expand Down
2 changes: 1 addition & 1 deletion linux/computing/ch85s03.html
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions linux/computing/cli.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
WatchedEvent state:SyncConnected type:None path:null

</pre>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1923"></a>89.2.1. help</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1927"></a>89.2.1. help</h3></div></div></div>

<pre class="screen">

Expand Down Expand Up @@ -65,7 +65,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1924"></a>89.2.2. ls</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1928"></a>89.2.2. ls</h3></div></div></div>

<pre class="screen">

Expand All @@ -74,7 +74,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1925"></a>89.2.3. create</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1929"></a>89.2.3. create</h3></div></div></div>

<pre class="screen">

Expand All @@ -86,7 +86,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1926"></a>89.2.4. get</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1930"></a>89.2.4. get</h3></div></div></div>

<pre class="screen">

Expand Down Expand Up @@ -120,7 +120,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1927"></a>89.2.5. set</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1931"></a>89.2.5. set</h3></div></div></div>

<pre class="screen">

Expand Down Expand Up @@ -154,7 +154,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1928"></a>89.2.6. delete</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id1932"></a>89.2.6. delete</h3></div></div></div>

<pre class="screen">

Expand Down
8 changes: 4 additions & 4 deletions linux/computing/computing.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/computing/index.html
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions linux/computing/parallel.html
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions linux/computing/zookeeper.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/container/index.html
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions linux/container/netkiller.docker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</pre>
<p>怎么样，只是换了另一种写法，并没有难度。下面我们就系统学习，如何使用 python 编排 docker 容器</p>
<p>实际上程序最终还是会转化做 docker-compose 脚本执行。这种写法的有点是更灵活，你可以在程序中使用 if, while, 链接数据库，等等操作，可以做更复杂的容器编排。</p>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2407"></a>108.2.1. 安装依赖库</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2412"></a>108.2.1. 安装依赖库</h3></div></div></div>

<pre class="screen">

Expand All @@ -84,7 +84,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2408"></a>108.2.2. 创建一个 Services </h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2413"></a>108.2.2. 创建一个 Services </h3></div></div></div>

<pre class="programlisting">

Expand Down Expand Up @@ -219,7 +219,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2409"></a>108.2.3. 创建 Composes</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2414"></a>108.2.3. 创建 Composes</h3></div></div></div>

<p>Services 对象创建服务，让服务工作还需要 Composes 对象。</p>
<pre class="programlisting">
Expand Down Expand Up @@ -334,7 +334,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2410"></a>108.2.4. 容器管理</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2415"></a>108.2.4. 容器管理</h3></div></div></div>

<p>Docker 对象是让我们摆脱 docker-compose 这个命令，它将接管 docker-compose 这个命令，进行自我管理。</p>
<pre class="programlisting">
Expand Down Expand Up @@ -408,11 +408,11 @@
</pre>
<p>使用 -c 可以查看 compose yaml 脚本，使用 -e 可以导出 docker compose yaml</p>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2412"></a>108.2.5. 演示例子</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2417"></a>108.2.5. 演示例子</h3></div></div></div>

<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2411"></a>108.2.5.1. Redis 主从配置</h4></div></div></div>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2416"></a>108.2.5.1. Redis 主从配置</h4></div></div></div>

<div class="example"><a id="id3098"></a><p class="title"><strong>例 108.1. Redis Master/Slave</strong></p><div class="example-contents">
<div class="example"><a id="id3109"></a><p class="title"><strong>例 108.1. Redis Master/Slave</strong></p><div class="example-contents">

<pre class="screen">

Expand Down Expand Up @@ -465,7 +465,7 @@
</div>
</div>

<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2413"></a>108.2.6. 使用 Python 编排 Dockerfile</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2418"></a>108.2.6. 使用 Python 编排 Dockerfile</h3></div></div></div>

<p></p>
<pre class="programlisting">
Expand Down Expand Up @@ -645,7 +645,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2414"></a>108.2.7. </h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2419"></a>108.2.7. </h3></div></div></div>

<pre class="programlisting">

Expand Down Expand Up @@ -710,7 +710,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2415"></a>108.2.8. logstash</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2420"></a>108.2.8. logstash</h3></div></div></div>

<pre class="screen">

Expand Down
22 changes: 11 additions & 11 deletions linux/container/netkiller.kubernetes.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/cryptography/aes/aes.php.html
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions linux/cryptography/aes/index.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/cryptography/bitlocker.html
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions linux/cryptography/code/index.html
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions linux/cryptography/code/quoted-printable.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<p>Quoted-Printable也是MIME邮件中常用的编码方式之一。同Base64一样，它也将输入的字符串或数据编码成全是ASCII码的可打印字符串。</p>
<p>Quoted-Printable编码的基本方法是：输入数据在33-60、62-126范围内的，直接输出；其它的需编码为“=”加两个字节的HEX码(大写)。为保证输出行不超过规定长度，可在行尾加“=\r\n”序列作为软回车。 </p>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2802"></a>151.3.1. C Quoted-Printable</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2807"></a>151.3.1. C Quoted-Printable</h3></div></div></div>

<pre xml:lang="c" class="screen" lang="c">

Expand Down Expand Up @@ -96,10 +96,10 @@
</pre>
<p>参考:http://dev.csdn.net/develop/article/19/19205.shtm</p>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2803"></a>151.3.2. Java Quoted-Printable</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2808"></a>151.3.2. Java Quoted-Printable</h3></div></div></div>

</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2804"></a>151.3.3. Python Quoted-Printable</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2809"></a>151.3.3. Python Quoted-Printable</h3></div></div></div>

</div>
</div><script xmlns="" type="text/javascript" id="clustrmaps" src="//cdn.clustrmaps.com/map_v2.js?u=r5HG&amp;d=9mi5r_kkDC8uxG8HuY3p4-2qgeeVypAK9vMD-2P6BYM"></script><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="uuencode.html">上一页</a> </td><td width="20%" align="center"><a accesskey="u" href="index.html">上一级</a></td><td width="40%" align="right"> <a accesskey="n" href="base58.html">下一页</a></td></tr><tr><td width="40%" align="left" valign="top">151.2. Uuencode </td><td width="20%" align="center"><a accesskey="h" href="../../index.html">起始页</a></td><td width="40%" align="right" valign="top"> 151.4. Base58</td></tr></table></div><script xmlns="">
Expand Down
4 changes: 2 additions & 2 deletions linux/cryptography/db/index.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/cryptography/des/crypt.java.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<br />
};<br />
</p></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2812"></a>153.5.1. Java 8 DES</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2817"></a>153.5.1. Java 8 DES</h3></div></div></div>

<pre class="programlisting">

Expand Down
2 changes: 1 addition & 1 deletion linux/cryptography/des/index.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/cryptography/devel/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<p>=?encode?B?Subject?=</p>
<p>B = BASE64</p>
<div class="example"><a id="id3116"></a><p class="title"><strong>例 164.1. Subject Unicode</strong></p><div class="example-contents">
<div class="example"><a id="id3127"></a><p class="title"><strong>例 164.1. Subject Unicode</strong></p><div class="example-contents">

<p>=?UTF-8?B?U3ViamVjdAo?=</p>
</div></div><br class="example-break" />
Expand Down
6 changes: 3 additions & 3 deletions linux/cryptography/digest/3rdparty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<pre class="screen">
$ sudo apt-get install apache2-utils
</pre>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2809"></a>152.4.1.1. CRYPT</h4></div></div></div>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2814"></a>152.4.1.1. CRYPT</h4></div></div></div>

<p></p>
<pre class="screen">
Expand All @@ -18,7 +18,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2810"></a>152.4.1.2. MD5</h4></div></div></div>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2815"></a>152.4.1.2. MD5</h4></div></div></div>

<pre class="screen">
neo@master:~$ htpasswd -m -n neo.chen
Expand All @@ -28,7 +28,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2811"></a>152.4.1.3. SHA</h4></div></div></div>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2816"></a>152.4.1.3. SHA</h4></div></div></div>

<pre class="screen">
neo@master:~$ htpasswd -s -n neo.chen
Expand Down
2 changes: 1 addition & 1 deletion linux/cryptography/digest/crc32.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2808"></a>152.3.2. Java CRC32</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2813"></a>152.3.2. Java CRC32</h3></div></div></div>

<pre class="programlisting">

Expand Down
8 changes: 4 additions & 4 deletions linux/cryptography/digest/index.html
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions linux/cryptography/gpg/GnuPG4Windows.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</p>
</td></tr></table></div>

<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2848"></a>155.12.1. 生成密钥对</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2853"></a>155.12.1. 生成密钥对</h3></div></div></div>

<p>使用 gpg --gen-key 生成密钥对</p>
<pre class="screen">
Expand Down Expand Up @@ -79,7 +79,7 @@
</pre>

</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2849"></a>155.12.2. 列出密钥</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2854"></a>155.12.2. 列出密钥</h3></div></div></div>

<p>列出密钥使用 gpg --list-keys</p>
<pre class="screen">
Expand Down Expand Up @@ -119,7 +119,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2850"></a>155.12.3. 验证签字</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2855"></a>155.12.3. 验证签字</h3></div></div></div>

<p>
检查 PGP 签名 与
Expand Down
6 changes: 3 additions & 3 deletions linux/cryptography/gpg/gpg.edit-key.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
gpg&gt;

</pre>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2834"></a>155.9.1. 显示帮助信息</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2839"></a>155.9.1. 显示帮助信息</h3></div></div></div>

<p>使用 "?" 显示帮助信息</p>
<pre class="screen">
Expand Down Expand Up @@ -76,7 +76,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2835"></a>155.9.2. 签名</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2840"></a>155.9.2. 签名</h3></div></div></div>

<pre class="screen">

Expand All @@ -88,7 +88,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2836"></a>155.9.3. 公钥信任配置</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2841"></a>155.9.3. 公钥信任配置</h3></div></div></div>

<p>当我们使用 GPG 加密文件的时候会提示如下。</p>
<pre class="screen">
Expand Down
16 changes: 8 additions & 8 deletions linux/cryptography/gpg/gpg.faq.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/cryptography/gpg/gpg.gen-key.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
sub rsa2048 2021-10-08 [E] [expires: 2023-10-08]

</pre>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2821"></a>155.2.1. 创建密钥并指定过期时间</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2826"></a>155.2.1. 创建密钥并指定过期时间</h3></div></div></div>

<p></p>
<pre class="screen">
Expand Down Expand Up @@ -97,7 +97,7 @@

</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2822"></a>155.2.2. 快速创建密钥对</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2827"></a>155.2.2. 快速创建密钥对</h3></div></div></div>

<pre class="screen">

Expand Down
14 changes: 7 additions & 7 deletions linux/cryptography/gpg/gpg.import.export.html
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions linux/cryptography/gpg/gpg.mysql.backup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<p>我们将在备份服务器上创建密钥，然后将公钥导出并在数据库服务器上导入。</p>
<p>数据库服务器运行定时备份脚本，加密备份文件，同时每日将加密后的备份文件同步到本地。</p>
<p>备份内容只能在备份服务器上解密和查看</p>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2837"></a>155.10.1. 创建密钥对</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2842"></a>155.10.1. 创建密钥对</h3></div></div></div>

<div class="procedure"><a id="id25646"></a><p class="title"><strong>过程 155.1. 密钥管理</strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id25679"></a><p class="title"><strong>过程 155.1. 密钥管理</strong></p><ol class="procedure" type="1"><li class="step">
<p>创建密钥</p>
<pre class="screen">

Expand Down Expand Up @@ -105,10 +105,10 @@
</pre>
</li></ol></div>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2838"></a>155.10.2. 数据库备份</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2843"></a>155.10.2. 数据库备份</h3></div></div></div>


<div class="procedure"><a id="id25666"></a><p class="title"><strong>过程 155.2. 数据库备份</strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id25699"></a><p class="title"><strong>过程 155.2. 数据库备份</strong></p><ol class="procedure" type="1"><li class="step">
<p>导入公钥</p>
<pre class="screen">

Expand Down Expand Up @@ -277,10 +277,10 @@
</pre>
</li></ol></div>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2839"></a>155.10.3. 数据库还原</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2844"></a>155.10.3. 数据库还原</h3></div></div></div>


<div class="procedure"><a id="id25688"></a><p class="title"><strong>过程 155.3. 数据库还原</strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id25721"></a><p class="title"><strong>过程 155.3. 数据库还原</strong></p><ol class="procedure" type="1"><li class="step">
<p>定时同步</p>
<pre class="screen">

Expand Down
8 changes: 4 additions & 4 deletions linux/cryptography/gpg/gpg.recipient.html
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions linux/cryptography/gpg/index.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/cryptography/index.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/cryptography/makecert/index.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/cryptography/office.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/cryptography/openssl/development.html
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions linux/cryptography/openssl/email.html
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions linux/cryptography/openssl/format.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
p7b以树状展示证书链(certificate chain)，同时也支持单个证书，不含私钥。<br />
</p></div>

<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2868"></a>156.6.1. CA证书</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2873"></a>156.6.1. CA证书</h3></div></div></div>

<p>用openssl创建CA证书的RSA密钥(PEM格式)：</p>
<pre class="screen">
openssl genrsa -des3 -out ca.key 1024
</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2869"></a>156.6.2. 创建CA证书有效期为一年</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2874"></a>156.6.2. 创建CA证书有效期为一年</h3></div></div></div>

<p>用openssl创建CA证书(PEM格式,假如有效期为一年)：</p>
<pre class="screen">
Expand Down Expand Up @@ -109,7 +109,7 @@
keytool -list -rfc --keystore netkiller.jks | openssl x509 -inform pem -pubkey
</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2870"></a>156.6.12. jks to pem</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2875"></a>156.6.12. jks to pem</h3></div></div></div>

<p>转换流程 jks - p12 - pem</p>
<pre class="screen">
Expand Down
10 changes: 5 additions & 5 deletions linux/cryptography/openssl/index.html
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions linux/cryptography/openssl/s_server.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/cryptography/openssl/web.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<pre class="screen">
# openssl req -x509 -nodes -days 1825 -newkey rsa:4096 -keyout /etc/nginx/ssl/api.netkiller.cn.key -out /etc/nginx/ssl/api.netkiller.cn.crt
</pre>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2854"></a>156.2.1.1. Nginx + Tomcat (HTTP2)</h4></div></div></div>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2859"></a>156.2.1.1. Nginx + Tomcat (HTTP2)</h4></div></div></div>

<pre class="screen">
upstream api.netkiller.cn {
Expand Down
Loading