From db9755b974aef817c7f22a14a7333144daa93209 Mon Sep 17 00:00:00 2001 From: Zhang Huangbin Date: Fri, 10 Oct 2014 10:35:27 +0800 Subject: [PATCH] Typo in setup_dns.html. --- convert.sh | 7 +------ html/setup_dns.html | 19 +++++++++++++------ installation/setup_dns.md | 22 ++++++++++++++++------ 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/convert.sh b/convert.sh index 1794707e..394e0168 100644 --- a/convert.sh +++ b/convert.sh @@ -44,11 +44,6 @@ for chapter_dir in ${all_chapter_dirs}; do # Get articles all_chapter_articles="$(find ${chapter_dir} -depth 1 -type f -iname '[0-9a-z]*.md')" - echo "* ${chapter_dir}/" - for article in ${all_chapter_articles}; do - echo " - ${article}" - done - # Output directory. # Remove prefix '[number]-' in chapter directory name. #chapter_dir_in_article="$(strip_name_prefix ${chapter_dir})" @@ -99,7 +94,7 @@ for chapter_dir in ${all_chapter_dirs}; do # 'src/default/' is path to view source file on bitbucket.org echo "* [${_article_title}](https://bitbucket.org/zhb/docs.iredmail.org/src/default/${article_file_without_prefix_path})" >> ${README_MD} - #${CMD_CONVERT} ${article_file} ${_output_chapter_dir} \ + echo "* Converting: ${article_file}" ${CMD_CONVERT} ${article_file} ${OUTPUT_DIR} \ output_filename="${article_html_file}" \ title="${_article_title}" \ diff --git a/html/setup_dns.html b/html/setup_dns.html index 3fbf05bf..489260ca 100644 --- a/html/setup_dns.html +++ b/html/setup_dns.html @@ -124,7 +124,7 @@ that e-mail. MX record is the location of your mail server that you have provided to the outside world via the DNS.

Most mail servers generally have more than one MX record, meaning you could have more than one mail server setup to receive e-mails. Each MX record has a -priority number assigned to it in the DNS. The MX record with lowest number +priority number assigned to it in the DNS. The MX record with lowest number has the highest priority and that is considered your primary MX record or your main mail server. The next lowest mx number has the next highest primary and so on. You generally have more than one mail server, one being the primary @@ -133,6 +133,14 @@ and the others as backups, only one MX for mail server is OK too.

If your ISP or domain name registrar is providing the DNS service, you can request them to set one up for you. If you manage your own DNS servers then you need to create the MX records in your DNS zone yourself.

+

Sample MX record:

+
NAME            PRIORITY    TYPE    DATA
+
+mydomain.com.   10          mx      mail.mydomain.com
+
+ +

The end result of this record is, emails sent to [user]@mydomain.com will +be delivered to server mail.mydomain.com.

SPF record for your mail domain name

What is a SPF record

SPF is a spam and phishing scam fighting method which uses DNS SPF-records to @@ -196,7 +204,7 @@ tag. Note that the same identity can have multiple identifiers.

  • Run command in terminal to show your DKIM keys:
    • # amavisd showkeys
-dkim._domainkey.iredmail.org.   3600 TXT (
+dkim._domainkey.mydomain.com.   3600 TXT (
   "v=DKIM1; p="
   "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYArsr2BKbdhv9efugByf7LhaK"
   "txFUt0ec5+1dWmcDv0WH0qZLFK711sibNN5LutvnaiuH+w3Kr8Ylbw8gq2j0UBok"
@@ -230,7 +238,7 @@ zone file directly.
    
 
 
 
    # amavisd testkeys
-TESTING: dkim._domainkey.iredmail.org      => pass
+TESTING: dkim._domainkey.mydomain.com       => pass
 
    
 
 
    If it shows pass, it works.
    
@@ -238,8 +246,7 @@ TESTING: dkim._domainkey.iredmail.org      => pass
 some hours to be available.
    
 
    References
    
 
      
-
    • http://www.emailtalk.org/MX.aspx
      • 
 
    • http://en.wikipedia.org/wiki/MX_record
      • 
-
    • http://www.openspf.org/RFC_4408
      • 
-
    • http://www.simpledns.com/
      • 
+
    • http://www.openspf.org/
      • 
+
    • http://www.dkim.org/
      • 
 

    If you found something wrong in this document, please do contact us to fix it.
    
\ No newline at end of file
diff --git a/installation/setup_dns.md b/installation/setup_dns.md
index 2508976d..869f4e71 100644
--- a/installation/setup_dns.md
+++ b/installation/setup_dns.md
@@ -98,7 +98,7 @@ provided to the outside world via the DNS.
 
 Most mail servers generally have more than one MX record, meaning you could
 have more than one mail server setup to receive e-mails. Each MX record has a
-priority number assigned to it in the DNS. __The MX record with lowest number
+priority number assigned to it in the DNS. The MX record with __lowest number
 has the highest priority__ and that is considered your primary MX record or
 your main mail server. The next lowest mx number has the next highest primary
 and so on. You generally have more than one mail server, one being the primary
@@ -110,6 +110,17 @@ If your ISP or domain name registrar is providing the DNS service, you can
 request them to set one up for you. If you manage your own DNS servers then
 you need to create the MX records in your DNS zone yourself.
 
+Sample MX record:
+
+```
+NAME            PRIORITY    TYPE    DATA
+
+mydomain.com.   10          mx      mail.mydomain.com
+```
+
+The end result of this record is, emails sent to `[user]@mydomain.com` will
+be delivered to server `mail.mydomain.com`.
+
 ## SPF record for your mail domain name
 
 ### What is a SPF record
@@ -190,7 +201,7 @@ tag. Note that the same identity can have multiple identifiers.
 
 ```bash
 # amavisd showkeys
-dkim._domainkey.iredmail.org.   3600 TXT (
+dkim._domainkey.mydomain.com.   3600 TXT (
   "v=DKIM1; p="
   "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYArsr2BKbdhv9efugByf7LhaK"
   "txFUt0ec5+1dWmcDv0WH0qZLFK711sibNN5LutvnaiuH+w3Kr8Ylbw8gq2j0UBok"
@@ -224,7 +235,7 @@ zone file directly.
 
 ```shell
 # amavisd testkeys
-TESTING: dkim._domainkey.iredmail.org      => pass
+TESTING: dkim._domainkey.mydomain.com       => pass
 ```
 
 If it shows `pass`, it works.
@@ -234,7 +245,6 @@ some hours to be available.
 
 ## References
 
-* http://www.emailtalk.org/MX.aspx
 * http://en.wikipedia.org/wiki/MX_record
-* http://www.openspf.org/RFC_4408
-* http://www.simpledns.com/
+* http://www.openspf.org/
+* http://www.dkim.org/