Skip to content

Commit 987f9cd

Browse files
committed
translate more 3 files in configuration.
1 parent 505ec84 commit 987f9cd

File tree

3 files changed

+42
-48
lines changed

3 files changed

+42
-48
lines changed

source/configuration/hosts.md

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
11
title: Hosts
22
---
33

4-
> 如果你愿意帮助hiproxy编写文档,请联系zdying@live.com, 谢谢!
5-
>
64
> If you are willing to help hiproxy to write documentation, please contact zdying@live.com, thank you!
75
8-
## 简介
6+
## Introduction
97

10-
**Hosts** 可以看作一个增强版的系统`hosts`,其最大特性是可以**支持端口转发**
8+
**Hosts** can be thought as enhanced `hosts` of OS, Its most important feature is **port forwarding**.
119

12-
****:hiproxy同时支持项目`hosts`[rewrite][rewrite]文件。`hosts`仅支持简单的域名转发,如果需要设置高级域名转发规则,请参考[rewrite][rewrite]
10+
**Note**: hiproxy support both `hosts` file and [`rewrite`][rewrite] file. `hosts` is a simple solution so that it supports only forwarding domain & port. If you want custom complex forwarding rules, see [rewrite][rewrite] as referrence.
1311

14-
## 工作机制
15-
**hiproxy** 启动时,会读取并解析各项目根目录中的`hosts`文件,代理服务器接收到请求后,会根据`hosts`文件做相应文请求的转发。
12+
## Working mechanism
1613

14+
**Hiproxy** will parse `hosts` files in the projects' immediate directories while it starts. The proxy server would forward received requests according to rules in `hosts` files.
1715

18-
## 特性
19-
* 支持端口转发;
20-
* 使用项目`hosts`文件,不会有系统自带`hosts`的缓存问题;
21-
* 修改项目`hosts`文件后,不需要重启hiproxy,hiproxy会自动自动更新`hosts`规则。
2216

23-
## 语法
17+
## Features
18+
* Port forwarding;
19+
* `hosts` file of project is used to instead of OS one and avoid system cache issue;
20+
* You do NOT need to restart hiproxy after modifying `hosts` file. Hiproxy can restart and refresh `hosts` rules automatically.
2421

25-
语法跟系统`hosts`语法基本一致,唯一区别是hiproxy的`hosts`支持**IP+端口**,语法如下:
22+
## Syntax
23+
24+
The syntax of project `hosts` is very similar as OS one. Supporting **IP+port** is the only difference. The syntax is:
2625

2726
```
28-
IP[:端口] 域名1 域名2 域名3 ... 域名N
27+
IP[:port] domain1 domain2 domain3 ... domainN
2928
```
3029

31-
## 例子
30+
## For Example
3231

3332
```bash
3433
# custom hosts with port :)
@@ -37,5 +36,4 @@ IP[:端口] 域名1 域名2 域名3 ... 域名N
3736
127.0.0.1 hiproxy.org blog.hiproxy.org
3837
```
3938

40-
4139
[rewrite]: ../rewrite/

source/configuration/rewrite.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
title: Rewrite
22
---
33

4-
> 如果你愿意帮助hiproxy编写文档,请联系zdying@live.com, 谢谢!
5-
>
64
> If you are willing to help hiproxy to write documentation, please contact zdying@live.com, thank you!
75
86

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,100 @@
11
title: Get And Install SSL Certificate
22
---
33

4-
> 如果你愿意帮助hiproxy编写文档,请联系zdying@live.com, 谢谢!
5-
>
64
> If you are willing to help hiproxy to write documentation, please contact zdying@live.com, thank you!
75
8-
hiporxy会自己生成一个根证书,扮演CA的角色(Hiproxy Custom CA)。hiproxy在代理https请求的时候,会自动生成证书并使用hiproxy的根证书签名。
6+
Hiproxy can generate its own root certificate. You can think it as a CA (Hiproxy Custom CA). If a https request need hiproxy to forward, hiproxy would use its own root certificate to generate automatically a secure certification of that https request.
97

10-
由于系统是不信任hiproxy根证书的,所以需要我们自己手动安装信任hiproxy的根证书。
8+
Hiproxy own root certificate is not trusted by OS, therefore, you have to install the root certificate by manual to let OS know it as trusted one.
119

12-
## 下载证书
10+
## Download The Certificate
1311

14-
启动hiproxy服务之后(假设端口号是`5525`),可以访问<http://127.0.0.1:5525/ssl-certificate>获取**Hiproxy Custom CA**的根证书。
12+
As soon as hiproxy is started (suppose the port number is `5525`), you can go <http://127.0.0.1:5525/ssl-certificate> to get the root certificate of **Hiproxy Custom CA**.
1513

16-
这个地址,可以在<http://127.0.0.1:5525/>中找到,如下图:
14+
You can get the URL from <http://127.0.0.1:5525/> by following below image:
1715

1816
<img src="../../images/hiproxy_start_page.png" width="500" />
1917

20-
## 安装证书
18+
## Install Certificate
2119

22-
下面将分别介绍OSX、iOS、Windows和Android中如何安装根证书。
20+
The following describes how the root certificate is installed in OSX, iOS, Windows and Android.
2321

24-
### OSX系统
22+
### OSX System
2523

26-
1. 下载完成根证书之后,双击`Hiproxy_Custom_CA_Certificate.pem`导入证书到钥匙串。
24+
1. Double click downloaded `Hiproxy_Custom_CA_Certificate.pem` to import the certificate to keychain.
2725

28-
2. 在弹出的对话框中输入用户密码。
26+
2. Input your username and password in popuped dialog.
2927

30-
3. 此时证书是不受信任状态,双击刚才导入的证书。
28+
3. Now the certificate is not trusted. You should double click the certificate which is imported in previous step.
3129

3230
<img src="../../images/import_root_cert.png" width="680" />
3331

34-
4. **信任** > **使用此证书时**下面选择**始终信任**
32+
4. Choose ** Always trust** by following **Trust** > **While using this certificate**.
3533

3634
<img src="../../images/trust_root_cert.png" width="680" />
3735

38-
5. 关闭对话框,此时证书已经是被信任状态。
36+
5. Close the dialog. Now the certificate is in trusted state.
3937

4038
<img src="../../images/root_cert_trusted.png" width="680" />
4139

4240

4341
### iOS系统
4442

45-
1. 下载完成根证书之后发送到手机并打开。
43+
1. Send the downloaded certificate to iPhone then open it in iOS.
4644

47-
2. 点击右上角的**安装**
45+
2. Click **Install** on the top right of the view.
4846

4947
<img src="../../images/ios_install_cert_1.jpg" width="375" />
5048

51-
3. 再次点击右上角的**安装**
49+
3. Click **Install** to confirm.
5250

5351
<img src="../../images/ios_install_cert_2.jpg" width="375" />
5452

55-
4. 完成安装,点击右上角**完成**退出。
53+
4. After complate installing, click **Complete** to finish and exit installing.
5654

5755
<img src="../../images/ios_install_cert_3.jpg" width="375" />
5856

59-
5. 如果**iOS系统版本 >= 10.3**,需要在**设置** > **通用** > **关于本机**中点击**证书信任设置**
57+
5. If the **iOS version &gt;= 10.3**, you have to click **Certificate trust settings** by following **Settings** &gt; **General** &gt; **About this iPhone**.
6058

6159
<img src="../../images/ios_install_cert_4.jpg" width="375" />
6260

63-
6. 打开开关**Hiproxy Custom CA**
61+
6. Open the switcher on **Hiproxy Custom CA**.
6462

6563
<img src="../../images/ios_install_cert_5.jpg" width="375" />
6664

6765
### Windows
6866

69-
1. 下载完成根证书之后,双击`Hiproxy_Custom_CA_Certificate.crt`安装证书。
67+
1. Double click downloaded `Hiproxy_Custom_CA_Certificate.crt` to install the certificate.
7068

71-
2. 在弹出的对话框中点击**安装证书**
69+
2. Click **Install certificate** on the popuped dialog.
7270

7371
<img src="../../images/windows_install_cert.png" width="420" />
7472

75-
3. 点击**下一步**
73+
3. Click **Next**.
7674

7775
<img src="../../images/windows_step_1.png" width="420" />
7876

79-
4. 选择**将所有的证书放入下列存储(P)**,点击**浏览(R)**,然后选择**受信任的根证书颁发机构**,点击**确定**
77+
4. Choose **Persist all certificates in below storage(P)** then click **Browse(R)** and select **Trusted CA**, click **OK**
8078

8179
<img src="../../images/windows_step_2.png" width="420" />
8280

83-
5. 点击**下一步****完成**。根据页面提示完成根证书安装。。
81+
5. Click **Next**, then **Finish**. Complete the certificate installing by following wizard.
8482

8583
<img src="../../images/windows_install_finish.png" width="420" />
8684

8785

8886
### Android
8987

90-
1. 下载完成根证书之后发送到手机。
88+
1. Download the certificate and send it to mobile.
9189

92-
2. **设置** > **安全**中点击**从SD卡安装**
90+
2. Click **Install from SD card** by following **Settings** &gt; **Security**.
9391

9492
<img src="../../images/android_install_cert_1.png" width="375" />
9593

96-
3. 输入解锁密码,然后输入证书名称,比如**HiproxyCustomCA**,点击**确定**
94+
3. Input the unlock password then certificate name, for example **HiproxyCustomCA**, then click **OK**.
9795

9896
<img src="../../images/android_install_cert_2.png" width="375" />
9997

100-
4. **设置** > **安全** > **受信任的证书** > **用户**中,如果能看到hiproxy的根证书,表示安装成功。
98+
4. Follow **Settings** &gt; **Security** &gt; **Trusted certificate** &gt; **Users**. If you can find hiproxy root certificate, it succeeds.
10199

102100
<img src="../../images/android_install_cert_3.png" width="375" />

0 commit comments

Comments
 (0)