Skip to content

[pull] master from netkiller:master #21

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.

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
May 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/apas02.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/apas05.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/apas07.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/apas08.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/appendix.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/ch114s02.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/ch118.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/communication.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/computing/ch85s03.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/container/netkiller.docker.html
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@

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

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

<pre class="screen">

Expand Down
2 changes: 1 addition & 1 deletion linux/cryptography/devel/index.html
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="id3159"></a><p class="title"><strong>例 164.1. Subject Unicode</strong></p><div class="example-contents">
<div class="example"><a id="id3161"></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/gpg/gpg.mysql.backup.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<p>备份内容只能在备份服务器上解密和查看</p>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2851"></a>155.10.1. 创建密钥对</h3></div></div></div>

<div class="procedure"><a id="id25732"></a><p class="title"><strong>过程 155.1. 密钥管理</strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id25734"></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 @@ -108,7 +108,7 @@
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2852"></a>155.10.2. 数据库备份</h3></div></div></div>


<div class="procedure"><a id="id25752"></a><p class="title"><strong>过程 155.2. 数据库备份</strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id25754"></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 @@ -280,7 +280,7 @@
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2853"></a>155.10.3. 数据库还原</h3></div></div></div>


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

Expand Down
2 changes: 1 addition & 1 deletion linux/cryptography/openssl/development.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2885"></a>156.8.1. DES encryption with OpenSSL</h3></div></div></div>

<div class="example"><a id="id3157"></a><p class="title"><strong>例 156.6. DES encryption example in C</strong></p><div class="example-contents">
<div class="example"><a id="id3159"></a><p class="title"><strong>例 156.6. DES encryption example in C</strong></p><div class="example-contents">

<pre class="screen">

Expand Down
6 changes: 3 additions & 3 deletions linux/cryptography/openssl/email.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
openssl pkcs12 -export -clcerts -in neo.cer -inkey ca.pem -out neo.p12
</pre>
<p>安装cer与p12两个证书,然后打开outlook测试</p>
<div class="example"><a id="id3154"></a><p class="title"><strong>例 156.3. 快速创建自签名证书</strong></p><div class="example-contents">
<div class="example"><a id="id3156"></a><p class="title"><strong>例 156.3. 快速创建自签名证书</strong></p><div class="example-contents">

<pre class="screen">
&lt;![CDATA[
Expand Down Expand Up @@ -86,7 +86,7 @@
<pre class="screen">
% openssl genrsa -des3 -out ca.key 1024
</pre>
<div class="example"><a id="id3155"></a><p class="title"><strong>例 156.4. 创建CA根证书</strong></p><div class="example-contents">
<div class="example"><a id="id3157"></a><p class="title"><strong>例 156.4. 创建CA根证书</strong></p><div class="example-contents">

<pre class="screen">
% openssl genrsa -des3 -out ca.key 1024
Expand All @@ -107,7 +107,7 @@
openssl req -new -x509 -days 365 -key ca.key -out ca.crt
</pre>
<p>生成证书的过程中需要输入证书的信息,</p>
<div class="example"><a id="id3156"></a><p class="title"><strong>例 156.5. 创建自签名的证书</strong></p><div class="example-contents">
<div class="example"><a id="id3158"></a><p class="title"><strong>例 156.5. 创建自签名的证书</strong></p><div class="example-contents">

<pre class="screen">
% openssl req -new -x509 -days 365 -key ca.key -out ca.crt
Expand Down
2 changes: 1 addition & 1 deletion linux/cryptography/openssl/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="dsa"></a>156.1.12. dsa</h3></div></div></div>

<div class="example"><a id="id3152"></a><p class="title"><strong>例 156.1. dsaparam &amp; gendsa</strong></p><div class="example-contents">
<div class="example"><a id="id3154"></a><p class="title"><strong>例 156.1. dsaparam &amp; gendsa</strong></p><div class="example-contents">

<pre class="screen">
# create parameters in dsaparam.pem
Expand Down
2 changes: 1 addition & 1 deletion linux/cryptography/openssl/s_server.html
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<pre class="screen">
openssl s_client -connect localhost:2009
</pre>
<div class="example"><a id="id3153"></a><p class="title"><strong>例 156.2. 加密传输文件</strong></p><div class="example-contents">
<div class="example"><a id="id3155"></a><p class="title"><strong>例 156.2. 加密传输文件</strong></p><div class="example-contents">

<p>现在我们来尝试使用使用 openssl 加密传输文件</p>
<p>传输 /etc/passwd 文件</p>
Expand Down
2 changes: 1 addition & 1 deletion linux/cryptography/tunnel/stunnel.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<p>http://www.stunnel.org/</p>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2889"></a>160.2.1. 通过SSL访问POP、IMAP、SMTP</h3></div></div></div>

<div class="example"><a id="id3158"></a><p class="title"><strong>例 160.1. stunnel.conf</strong></p><div class="example-contents">
<div class="example"><a id="id3160"></a><p class="title"><strong>例 160.1. stunnel.conf</strong></p><div class="example-contents">

<pre class="screen">

Expand Down
2 changes: 1 addition & 1 deletion linux/cvs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="installation"></a>121.1. installation</h2></div></div></div>

<div class="procedure"><a id="id24218"></a><p class="title"><strong>过程 121.1. install cvs</strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id24220"></a><p class="title"><strong>过程 121.1. install cvs</strong></p><ol class="procedure" type="1"><li class="step">
<p>install</p>
<pre class="screen">
$ sudo apt-get install xinetd
Expand Down
2 changes: 1 addition & 1 deletion linux/deploy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
module name to execute (default=command)</a></span></dt><dt><span class="section"><a href="ansible/command.html#id2702">123.3.5. -s, --sudo run operations with sudo (nopasswd)</a></span></dt><dt><span class="section"><a href="ansible/command.html#id2703">123.3.6. -u REMOTE_USER, --user=REMOTE_USER connect as this user (default=root)</a></span></dt><dt><span class="section"><a href="ansible/command.html#id2704">123.3.7. 使用实例</a></span></dt></dl></dd><dt><span class="section"><a href="ansible/ansible-doc.html">123.4. ansible-doc - Show Ansible module documentation</a></span></dt><dt><span class="section"><a href="ansible/playbook.html">123.5. ansible-playbook - run an ansible playbook</a></span></dt><dd><dl><dt><span class="section"><a href="ansible/playbook.html#id2705">123.5.1. 包含文件用法</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="capistrano.html">124. Capistrano</a></span></dt><dt><span class="chapter"><a href="puppet/index.html">125. Puppet</a></span></dt><dd><dl><dt><span class="section"><a href="puppet/index.html#install">125.1. Installing Puppet CentOS 6.3</a></span></dt><dt><span class="section"><a href="puppet/sign.html">125.2. Puppet 签名</a></span></dt><dd><dl><dt><span class="section"><a href="puppet/sign.html#id2706">125.2.1. Agent 节点</a></span></dt><dt><span class="section"><a href="puppet/sign.html#id2707">125.2.2. Master 服务器</a></span></dt></dl></dd><dt><span class="section"><a href="puppet/test.html">125.3. test</a></span></dt><dd><dl><dt><span class="section"><a href="puppet/test.html#id2708">125.3.1. Master</a></span></dt><dt><span class="section"><a href="puppet/test.html#id2709">125.3.2. Agent</a></span></dt></dl></dd><dt><span class="section"><a href="puppet/config.html">125.4. 配置文件</a></span></dt><dd><dl><dt><span class="section"><a href="puppet/config.html#id2710">125.4.1. /etc/sysconfig/puppet</a></span></dt><dt><span class="section"><a href="puppet/config.html#id2711">125.4.2. /etc/puppet/fileserver.conf</a></span></dt></dl></dd><dt><span class="section"><a href="puppet/manifests.html">125.5. manifests</a></span></dt><dd><dl><dt><span class="section"><a href="puppet/manifests.html#id2712">125.5.1. node</a></span></dt><dt><span class="section"><a href="puppet/manifests.html#id2715">125.5.2. group, user 用户组管理</a></span></dt><dt><span class="section"><a href="puppet/manifests.html#id2719">125.5.3. file</a></span></dt><dt><span class="section"><a href="puppet/manifests.html#id2720">125.5.4. package</a></span></dt><dt><span class="section"><a href="puppet/manifests.html#id2721">125.5.5. service</a></span></dt><dt><span class="section"><a href="puppet/manifests.html#id2722">125.5.6. exec</a></span></dt><dt><span class="section"><a href="puppet/manifests.html#id2723">125.5.7. cron</a></span></dt></dl></dd><dt><span class="section"><a href="puppet/modules.html">125.6. modules</a></span></dt><dt><span class="section"><a href="puppet/firewall.html">125.7. firewall 配置</a></span></dt><dt><span class="section"><a href="puppet/debug.html">125.8. debug</a></span></dt><dd><dl><dt><span class="section"><a href="puppet/debug.html#id2724">125.8.1. master</a></span></dt><dt><span class="section"><a href="puppet/debug.html#id2725">125.8.2. node</a></span></dt></dl></dd><dt><span class="section"><a href="puppet/faq.html">125.9. FAQ</a></span></dt><dd><dl><dt><span class="section"><a href="puppet/faq.html#id2726">125.9.1. err: Could not request certificate: No route to host - connect(2)</a></span></dt><dt><span class="section"><a href="puppet/faq.html#id2727">125.9.2. No help available unless you have RDoc::usage installed</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="saltstack/index.html">126. SaltStack</a></span></dt><dd><dl><dt><span class="section"><a href="saltstack/index.html#id2734">126.1. 安装 Salt Stack</a></span></dt><dd><dl><dt><span class="section"><a href="saltstack/index.html#id2728">126.1.1. 服务端安装</a></span></dt><dt><span class="section"><a href="saltstack/index.html#id2729">126.1.2. 客户端安装</a></span></dt><dt><span class="section"><a href="saltstack/index.html#id2730">126.1.3. 防火墙配置</a></span></dt><dt><span class="section"><a href="saltstack/index.html#id2731">126.1.4. key 管理</a></span></dt><dt><span class="section"><a href="saltstack/index.html#id2732">126.1.5. 测试</a></span></dt><dt><span class="section"><a href="saltstack/index.html#id2733">126.1.6. Demo</a></span></dt></dl></dd><dt><span class="section"><a href="saltstack/salt-key.html">126.2. salt-key - Salt key is used to manage Salt authentication keys</a></span></dt><dt><span class="section"><a href="saltstack/salt.html">126.3. salt 命令</a></span></dt><dd><dl><dt><span class="section"><a href="saltstack/salt.html#id2737">126.3.1. cmd</a></span></dt><dt><span class="section"><a href="saltstack/salt.html#id2738">126.3.2. pkg.install</a></span></dt><dt><span class="section"><a href="saltstack/salt.html#id2739">126.3.3. network.interfaces</a></span></dt><dt><span class="section"><a href="saltstack/salt.html#id2740">126.3.4. salt example</a></span></dt></dl></dd><dt><span class="section"><a href="saltstack/salt.master.html">126.4. /etc/salt/master</a></span></dt><dd><dl><dt><span class="section"><a href="saltstack/salt.master.html#id2741">126.4.1. File Server settings</a></span></dt><dt><span class="section"><a href="saltstack/salt.master.html#id2742">126.4.2. Pillar settings</a></span></dt><dt><span class="section"><a href="saltstack/salt.master.html#id2743">126.4.3. Node Groups</a></span></dt><dt><span class="section"><a href="saltstack/salt.master.html#id2744">126.4.4. File Server Backend</a></span></dt></dl></dd><dt><span class="section"><a href="saltstack/salt.stack.html">126.5. sls 脚本</a></span></dt><dd><dl><dt><span class="section"><a href="saltstack/salt.stack.html#id2745">126.5.1. pkg</a></span></dt><dt><span class="section"><a href="saltstack/salt.stack.html#id2746">126.5.2. service</a></span></dt></dl></dd><dt><span class="section"><a href="saltstack/salt.faq.html">126.6. FAQ</a></span></dt><dd><dl><dt><span class="section"><a href="saltstack/salt.faq.html#id2747">126.6.1. Git fileserver backend is enabled in configuration but could not be loaded, is git-python installed</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="chef.html">127. Chef</a></span></dt><dd><dl><dt><span class="section"><a href="chef.html#id2749">127.1. 安装 Chef</a></span></dt><dd><dl><dt><span class="section"><a href="chef.html#id2748">127.1.1. CentOS</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="cobbler.html">128. Cobbler</a></span></dt><dt><span class="chapter"><a href="cfengine.html">129. Cfengine</a></span></dt><dt><span class="chapter"><a href="func.html">130. func</a></span></dt><dt><span class="chapter"><a href="rex.html">131. (R)?ex Deployment &amp; Configuration Management</a></span></dt><dt><span class="chapter"><a href="wsa.html">132. 基于Web的系统管理软件</a></span></dt><dd><dl><dt><span class="section"><a href="wsa.html#webmin">132.1. Webmin</a></span></dt><dd><dl><dt><span class="section"><a href="wsa.html#id2750">132.1.1. webalizer</a></span></dt></dl></dd><dt><span class="section"><a href="ajenti.html">132.2. ajenti</a></span></dt></dl></dd></dl></div>


<div class="table"><a id="id3040"></a><p class="title"><strong>表 8. 表格标题</strong></p><div class="table-contents">
<div class="table"><a id="id3042"></a><p class="title"><strong>表 8. 表格标题</strong></p><div class="table-contents">

<table class="table" summary="表格标题" border="1"><colgroup><col /><col /></colgroup><thead><tr><th>名称</th><th>流行度</th><th>开发语言</th><th>工作模式</th><th>其他</th></tr></thead><tbody><tr><td>Puppet</td><td>主流</td><td>Ruby</td><td>C/S</td><td> </td></tr><tr><td>Chef</td><td>主流</td><td>Ruby</td><td>C/S</td><td> </td></tr><tr><td>SaltStack</td><td>主流(新星)</td><td>Python</td><td>C/S</td><td> </td></tr><tr><td>ansible</td><td>一般</td><td>Python</td><td>Server 结构无需 client</td><td>Redhat 开发</td></tr></tbody></table>
</div></div><br class="table-break" />
Expand Down
4 changes: 2 additions & 2 deletions linux/deploy/puppet/sign.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<pre class="screen">
puppetd --test --server puppet
</pre>
<div class="example"><a id="id3149"></a><p class="title"><strong>例 125.1. puppetd</strong></p><div class="example-contents">
<div class="example"><a id="id3151"></a><p class="title"><strong>例 125.1. puppetd</strong></p><div class="example-contents">

<pre class="screen">
# puppetd --test --server puppet
Expand Down Expand Up @@ -46,7 +46,7 @@
puppetca -l
puppetca -sign www.mydomain.com
</pre>
<div class="example"><a id="id3150"></a><p class="title"><strong>例 125.2. puppetca</strong></p><div class="example-contents">
<div class="example"><a id="id3152"></a><p class="title"><strong>例 125.2. puppetca</strong></p><div class="example-contents">

<pre class="screen">
# puppetca --list
Expand Down
2 changes: 1 addition & 1 deletion linux/deploy/saltstack/salt.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id2740"></a>126.3.4. salt example</h3></div></div></div>

<div class="example"><a id="id3151"></a><p class="title"><strong>例 126.1. salt command</strong></p><div class="example-contents">
<div class="example"><a id="id3153"></a><p class="title"><strong>例 126.1. salt command</strong></p><div class="example-contents">

<pre class="screen">

Expand Down
2 changes: 1 addition & 1 deletion linux/deploy/wsa.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<p>网站</p>
<p><a class="ulink" href="http://www.webmin.com/" target="_top">http://www.webmin.com/</a></p>
<div class="procedure"><a id="id24760"></a><p class="title"><strong>过程 132.1. Webmin 安装步骤:</strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id24762"></a><p class="title"><strong>过程 132.1. Webmin 安装步骤:</strong></p><ol class="procedure" type="1"><li class="step">
<p><a class="ulink" href="http://prdownloads.sourceforge.net/webadmin/webmin_1.380_all.deb" target="_top">Debian Package</a></p>
</li><li class="step">
<p>命令:</p>
Expand Down
2 changes: 1 addition & 1 deletion linux/docker/ch104s02.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions linux/docker/docker.example.html
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@
<p>本例子使用 alpine 版本</p>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="id2190"></a>104.14.4.1. nginx:latest</h4></div></div></div>

<div class="procedure"><a id="id19325"></a><p class="title"><strong>过程 104.1. </strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id19327"></a><p class="title"><strong>过程 104.1. </strong></p><ol class="procedure" type="1"><li class="step">
<p></p>
<pre class="screen">

Expand Down Expand Up @@ -585,7 +585,7 @@
</div>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="alpine"></a>104.14.4.2. 安装 Docker Nginx alpine</h4></div></div></div>

<div class="procedure"><a id="id19337"></a><p class="title"><strong>过程 104.2. Docker nginx</strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id19339"></a><p class="title"><strong>过程 104.2. Docker nginx</strong></p><ol class="procedure" type="1"><li class="step">
<p>获取镜像</p>
<pre class="screen">

Expand Down
2 changes: 1 addition & 1 deletion linux/git/ch119s06.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion linux/git/git.remote.html
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
</div>
<div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="git.xinetd"></a>119.9.7.3. inet.conf / xinetd 方式启动</h4></div></div></div>

<div class="procedure"><a id="id23707"></a><p class="title"><strong>过程 119.2. git-daemon</strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id23709"></a><p class="title"><strong>过程 119.2. git-daemon</strong></p><ol class="procedure" type="1"><li class="step">
<p>/etc/shells</p>
<p>/etc/shells 最后一行添加 '/usr/bin/git-shell'</p>
<pre class="screen">
Expand Down
2 changes: 1 addition & 1 deletion linux/git/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<p>homepage: http://git.or.cz/index.html</p>
<p></p>
<div class="procedure"><a id="id23396"></a><p class="title"><strong>过程 119.1. Git </strong></p><ol class="procedure" type="1"><li class="step">
<div class="procedure"><a id="id23398"></a><p class="title"><strong>过程 119.1. Git </strong></p><ol class="procedure" type="1"><li class="step">
<p>install</p>
<pre class="screen">
sudo apt-get install git-core
Expand Down
Loading