瀏覽代碼

Note about https

Bob Mottram 7 年之前
父節點
當前提交
ad1388da3d
共有 2 個檔案被更改,包括 16 行新增10 行删除
  1. 2
    0
      doc/EN/app_matrix.org
  2. 14
    10
      website/EN/app_matrix.html

+ 2
- 0
doc/EN/app_matrix.org 查看文件

@@ -22,6 +22,8 @@
22 22
 
23 23
 Matrix is a federated communications system, typically for multi-user chat, with end-to-end content security features. You can consider it to be like a modernized version of IRC chat where the crypto and access controls have been built in by default. At present Matrix is really only a creature of the clearnet and so there isn't any way to protect the metadata. Despite the talk of security the lack of metadata defenses make this really only suitable for public communications, similar to microblogging or public IRC channels.
24 24
 
25
+Another consideration is that since matrix operates on the usual HTTPS port number (443) this may make it difficult for ISPs or governments to censor this type of communications via port blocking without significant blowback.
26
+
25 27
 * Installation
26 28
 Log into your system with:
27 29
 

+ 14
- 10
website/EN/app_matrix.html 查看文件

@@ -3,7 +3,7 @@
3 3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6
-<!-- 2017-05-10 Wed 20:25 -->
6
+<!-- 2017-08-23 Wed 19:23 -->
7 7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 9
 <title></title>
@@ -260,9 +260,13 @@ for the JavaScript code in this tag.
260 260
 Matrix is a federated communications system, typically for multi-user chat, with end-to-end content security features. You can consider it to be like a modernized version of IRC chat where the crypto and access controls have been built in by default. At present Matrix is really only a creature of the clearnet and so there isn't any way to protect the metadata. Despite the talk of security the lack of metadata defenses make this really only suitable for public communications, similar to microblogging or public IRC channels.
261 261
 </p>
262 262
 
263
-<div id="outline-container-orgc5ac459" class="outline-2">
264
-<h2 id="orgc5ac459">Installation</h2>
265
-<div class="outline-text-2" id="text-orgc5ac459">
263
+<p>
264
+Another consideration is that since matrix operates on the usual HTTPS port number (443) this may make it difficult for ISPs or governments to censor this type of communications via port blocking without significant blowback.
265
+</p>
266
+
267
+<div id="outline-container-orgc78770d" class="outline-2">
268
+<h2 id="orgc78770d">Installation</h2>
269
+<div class="outline-text-2" id="text-orgc78770d">
266 270
 <p>
267 271
 Log into your system with:
268 272
 </p>
@@ -282,9 +286,9 @@ Select <b>Add/Remove Apps</b> then <b>matrix</b>. You will then be asked for a d
282 286
 </div>
283 287
 </div>
284 288
 
285
-<div id="outline-container-orgd4dad6a" class="outline-2">
286
-<h2 id="orgd4dad6a">Initial setup</h2>
287
-<div class="outline-text-2" id="text-orgd4dad6a">
289
+<div id="outline-container-org5262b52" class="outline-2">
290
+<h2 id="org5262b52">Initial setup</h2>
291
+<div class="outline-text-2" id="text-org5262b52">
288 292
 <p>
289 293
 Go to the <b>Administrator control panel</b> and select <b>Passwords</b> then <b>matrix</b>. This will give you the password to initially log in to the system and you can change it later from a client app if needed.
290 294
 </p>
@@ -299,9 +303,9 @@ Other client apps are available but are currently mostly only at the alpha stage
299 303
 </div>
300 304
 </div>
301 305
 
302
-<div id="outline-container-org43f1308" class="outline-2">
303
-<h2 id="org43f1308">DNS setup</h2>
304
-<div class="outline-text-2" id="text-org43f1308">
306
+<div id="outline-container-orgd8eede9" class="outline-2">
307
+<h2 id="orgd8eede9">DNS setup</h2>
308
+<div class="outline-text-2" id="text-orgd8eede9">
305 309
 <p>
306 310
 It's recommended that you add an SRV record for Matrix to your DNS setup. How you do this will depend upon your dynamic DNS provider and their web interface. On FreeDNS on the subdomains settings in addition to the subdomain which you are using for the matrix server create an extra entry as follows:
307 311
 </p>