浏览代码

Mention official domains

Bob Mottram 9 年前
父节点
当前提交
8f2ed0cda9
共有 4 个文件被更改,包括 8 次插入26 次删除
  1. 1
    1
      doc/EN/installation.org
  2. 2
    9
      doc/EN/usage.org
  3. 2
    2
      website/EN/installation.html
  4. 3
    14
      website/EN/usage.html

+ 1
- 1
doc/EN/installation.org 查看文件

75
 * Checklist
75
 * Checklist
76
 Before installing Freedombone you will need a few things.
76
 Before installing Freedombone you will need a few things.
77
 
77
 
78
-  * Have some domains, or subdomains, registered with a dynamic DNS service
78
+  * Have some domains, or subdomains, registered with a dynamic DNS service. For the full install you may need two "official" purchased domains or be using a subdomain provider which is supported by Let's Encrypt.
79
   * System with a new installation of Debian Jessie or a downloaded/prepared disk image
79
   * System with a new installation of Debian Jessie or a downloaded/prepared disk image
80
   * Ethernet connection between the system and your internet router
80
   * Ethernet connection between the system and your internet router
81
   * That it is possible to forward ports from the internet router to the system, typically via firewall settings
81
   * That it is possible to forward ports from the internet router to the system, typically via firewall settings

+ 2
- 9
doc/EN/usage.org 查看文件

150
 | User settings   | Bio limit 1000                   |
150
 | User settings   | Bio limit 1000                   |
151
 | Access settings | /Invite only/ ticked             |
151
 | Access settings | /Invite only/ ticked             |
152
 * Social Network
152
 * Social Network
153
-** Certificates
154
-You will need to have a non self-signed SSL certificate in order to use Hubzilla. Put the public certificate in */etc/ssl/certs/yourhubzilladomainname.crt* and the private certificate in */etc/ssl/private/yourhubzilladomainname.key*. If there is an intermediate certificate needed (such as with StartSSL) then this will need to be concatenated onto the end of the crt file, like this:
155
-
156
-#+BEGIN_SRC bash
157
-cat /etc/ssl/certs/yourhubzilladomainname.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem >
158
- /etc/ssl/certs/yourhubzilladomainname.bundle.crt
159
-#+END_SRC
160
-
161
-Then change ssl_certificate to */etc/ssl/certs/yourhubzilladomainname.bundle.crt* within */etc/nginx/sites-available/yourhubzilladomainname*
153
+** Domains
154
+Both Hubzilla and GNU Social try to obtain certificates automatically at the time of installation via Let's Encrypt. This will likely mean that in order for this to work you'll need to have obtained at least one "official" domain via a domain selling service, since Let's Encrypt mostly doesn't seem to work with free subdomains from sites such as freeDNS.
162
 ** Initial install
155
 ** Initial install
163
 Visit the URL of your Hubzilla site and you should be taken through the rest of the installation procedure.  Note that this may take a few minutes so don't be concerned if it looks as if it has crashed - just leave it running.
156
 Visit the URL of your Hubzilla site and you should be taken through the rest of the installation procedure.  Note that this may take a few minutes so don't be concerned if it looks as if it has crashed - just leave it running.
164
 
157
 

+ 2
- 2
website/EN/installation.html 查看文件

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2015-12-18 Fri 22:53 -->
6
+<!-- 2015-12-19 Sat 22:28 -->
7
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
9
 <title></title>
9
 <title></title>
291
 </p>
291
 </p>
292
 
292
 
293
 <ul class="org-ul">
293
 <ul class="org-ul">
294
-<li>Have some domains, or subdomains, registered with a dynamic DNS service</li>
294
+<li>Have some domains, or subdomains, registered with a dynamic DNS service. For the full install you may need two "official" purchased domains or be using a subdomain provider which is supported by Let's Encrypt.</li>
295
 <li>System with a new installation of Debian Jessie or a downloaded/prepared disk image</li>
295
 <li>System with a new installation of Debian Jessie or a downloaded/prepared disk image</li>
296
 <li>Ethernet connection between the system and your internet router</li>
296
 <li>Ethernet connection between the system and your internet router</li>
297
 <li>That it is possible to forward ports from the internet router to the system, typically via firewall settings</li>
297
 <li>That it is possible to forward ports from the internet router to the system, typically via firewall settings</li>

+ 3
- 14
website/EN/usage.html 查看文件

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2015-12-18 Fri 22:25 -->
6
+<!-- 2015-12-19 Sat 22:29 -->
7
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
9
 <title></title>
9
 <title></title>
544
 <h2 id="orgheadline6">Social Network</h2>
544
 <h2 id="orgheadline6">Social Network</h2>
545
 <div class="outline-text-2" id="text-orgheadline6">
545
 <div class="outline-text-2" id="text-orgheadline6">
546
 </div><div id="outline-container-orgheadline14" class="outline-3">
546
 </div><div id="outline-container-orgheadline14" class="outline-3">
547
-<h3 id="orgheadline14">Certificates</h3>
547
+<h3 id="orgheadline14">Domains</h3>
548
 <div class="outline-text-3" id="text-orgheadline14">
548
 <div class="outline-text-3" id="text-orgheadline14">
549
 <p>
549
 <p>
550
-You will need to have a non self-signed SSL certificate in order to use Hubzilla. Put the public certificate in <b>/etc/ssl/certs/yourhubzilladomainname.crt</b> and the private certificate in <b>/etc/ssl/private/yourhubzilladomainname.key</b>. If there is an intermediate certificate needed (such as with StartSSL) then this will need to be concatenated onto the end of the crt file, like this:
551
-</p>
552
-
553
-<div class="org-src-container">
554
-
555
-<pre class="src src-bash">cat /etc/ssl/certs/yourhubzilladomainname.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem &gt;
556
- /etc/ssl/certs/yourhubzilladomainname.bundle.crt
557
-</pre>
558
-</div>
559
-
560
-<p>
561
-Then change ssl_certificate to <b>/etc/ssl/certs/yourhubzilladomainname.bundle.crt</b> within <b>/etc/nginx/sites-available/yourhubzilladomainname</b>
550
+Both Hubzilla and GNU Social try to obtain certificates automatically at the time of installation via Let's Encrypt. This will likely mean that in order for this to work you'll need to have obtained at least one "official" domain via a domain selling service, since Let's Encrypt mostly doesn't seem to work with free subdomains from sites such as freeDNS.
562
 </p>
551
 </p>
563
 </div>
552
 </div>
564
 </div>
553
 </div>