deploy: aae42fae9b

2024-01-19 02:48:50 +00:00 · 2023-10-04 10:54:08 +00:00 · 2023-10-04 10:54:08 +00:00 · 86986a5f75
parent 79cccbf33e
commit 86986a5f75
7 changed files with 110 additions and 107 deletions
--- a/edge/config/security/ssl/index.html
+++ b/edge/config/security/ssl/index.html
@ -2291,11 +2291,11 @@ docker<span class="w"> </span>run<span class="w"> </span>--rm<span class="w"> </
 <p>Store the <em>API token</em> you received in a file <code>cloudflare.ini</code> with content:</p>
 <div class="highlight"><pre><span></span><code><span class="na">dns_cloudflare_api_token</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">YOUR_CLOUDFLARE_TOKEN_HERE</span>
 </code></pre></div>
-</li>
-<li>
-<p>As this is sensitive data, you should restrict access to it with <code>chmod 600</code> and <code>chown 0:0</code>.</p>
-</li>
+<ul>
+<li>As this is sensitive data, you should restrict access to it with <code>chmod 600</code> and <code>chown 0:0</code>.</li>
 <li>Store the file in a folder if you like, such as <code>docker-data/certbot/secrets/</code>.</li>
+</ul>
+</li>
 <li>
 <p>Your <code>compose.yaml</code> should include the following:</p>
 <div class="highlight"><pre><span></span><code><span class="nt">services</span><span class="p">:</span>
--- a/edge/contributing/tests/index.html
+++ b/edge/contributing/tests/index.html
@ -2104,6 +2104,7 @@
 <span class="go">  ✓ [Rspamd] normal mail passes fine [44]</span>
 <span class="go">  ✓ [Rspamd] detects and rejects spam [122]</span>
 <span class="go">  ✓ [Rspamd] detects and rejects virus [189]</span>
+
 <span class="go">clamav.bats</span>
 <span class="go">  ✓ [ClamAV] log files exist at /var/log/mail directory [68]</span>
 <span class="go">  ✓ [ClamAV] should be identified by Amavis [67]</span>
@ -2115,8 +2116,10 @@
 <div class="highlight"><pre><span></span><code><span class="gp">$ </span>make<span class="w"> </span>clean<span class="w"> </span>generate-accounts<span class="w"> </span>tests/parallel/set1
 <span class="go">default_relay_host.bats</span>
 <span class="go">  ✓ [Relay] (ENV) &#39;DEFAULT_RELAY_HOST&#39; should configure &#39;main.cf:relayhost&#39; [88]</span>
+
 <span class="go">spam_virus/amavis.bats</span>
 <span class="go">  ✓ [Amavis] SpamAssassin integration should be active [1165]</span>
+
 <span class="go">spam_virus/clamav.bats</span>
 <span class="go">  ✓ [ClamAV] log files exist at /var/log/mail directory [73]</span>
 <span class="go">  ✓ [ClamAV] should be identified by Amavis [67]</span>
@ -2125,7 +2128,6 @@
 </code></pre></div>
 <p>Even better, before opening a PR run the full test suite:</p>
 <div class="highlight"><pre><span></span><code><span class="gp">$ </span>make<span class="w"> </span>clean<span class="w"> </span>tests
-<span class="go">...</span>
 </code></pre></div>


--- a/edge/faq/index.html
+++ b/edge/faq/index.html
@ -2841,7 +2841,8 @@ chmod<span class="w"> </span><span class="m">0644</span><span class="w"> </span>
  <span class="nb">fileinto</span> <span class="s">&quot;Junk&quot;</span><span class="p">;</span>
 <span class="p">}</span> <span class="nb">elsif</span> <span class="nb">allof</span> <span class="p">(</span>
  <span class="nb">not</span> <span class="nb">header</span> <span class="nt">:matches</span> <span class="s">&quot;x-spam-score&quot;</span> <span class="s">&quot;-*&quot;</span><span class="p">,</span>
-   <span class="nb">header</span> <span class="nt">:value</span> <span class="s">&quot;ge&quot;</span> <span class="nt">:comparator</span> <span class="s">&quot;i;ascii-numeric&quot;</span> <span class="s">&quot;x-spam-score&quot;</span> <span class="s">&quot;3.75&quot;</span> <span class="p">)</span> <span class="p">{</span>
+  <span class="nb">header</span> <span class="nt">:value</span> <span class="s">&quot;ge&quot;</span> <span class="nt">:comparator</span> <span class="s">&quot;i;ascii-numeric&quot;</span> <span class="s">&quot;x-spam-score&quot;</span> <span class="s">&quot;3.75&quot;</span>
+<span class="p">)</span> <span class="p">{</span>
  <span class="nb">fileinto</span> <span class="s">&quot;Junk&quot;</span><span class="p">;</span>
 <span class="p">}</span>
 </code></pre></div>
--- a/edge/introduction/index.html
+++ b/edge/introduction/index.html
@ -2116,18 +2116,18 @@ B) Bob sends an email to <code>alice@gmail.com</code> =&gt; the email is first s
 <p>When it comes to the specifics of email exchange, we have to look at protocols and ports enabled to support all the identified purposes. There are several valid options and they've been evolving overtime.</p>
 <h3 id="overview"><a class="toclink" href="#overview">Overview</a></h3>
 <p>The following picture gives a visualization of the interplay of all components and their <a href="../config/security/understanding-the-ports/">respective ports</a>:</p>
-<div class="highlight"><pre><span></span><code> ┏━━━━━━━━━━ Submission ━━━━━━━━━━━━┓┏━━━━━━━━━━━━━ Transfer/Relay ━━━━━━━━━━━┓
+<div class="highlight"><pre><span></span><code>  ┏━━━━━━━━━━ Submission ━━━━━━━━━━━━━┓┏━━━━━━━━━━━━━ Transfer/Relay ━━━━━━━━━━━┓

                            ┌─────────────────────┐                    ┌┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┐
-MUA ----- STARTTLS ------&gt; ┤(587)   MTA ╮    (25)├ &lt;-- cleartext ---&gt; ┊ Third-party MTA ┊
-    ----- implicit TLS --&gt; ┤(465)       │        |                    └┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┘
-    ----- cleartext -----&gt; ┤(25)        │        |
+MUA ----- STARTTLS -------&gt; ┤(587)   MTA ╮    (25)├ &lt;-- cleartext ---&gt; ┊ Third-party MTA ┊
+    ----- implicit TLS ---&gt; ┤(465)       │        |                    └┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┘
+    ----- cleartext ------&gt; ┤(25)        │        |
                            |┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄|
-MUA &lt;---- STARTTLS ------- ┤(143)   MDA ╯        |
-    &lt;---- implicit TLS --- ┤(993)                |
+MUA &lt;---- STARTTLS -------- ┤(143)   MDA ╯        |
+    &lt;---- implicit TLS ---- ┤(993)                |
                            └─────────────────────┘

- ┗━━━━━━━━━━ Retrieval ━━━━━━━━━━━━━┛
+  ┗━━━━━━━━━━ Retrieval ━━━━━━━━━━━━━━┛
 </code></pre></div>
 <p>If you're new to email infrastructure, both that table and the schema may be confusing.
 Read on to expand your understanding and learn about DMS's configuration, including how you can customize it.</p>
@ -2146,7 +2146,7 @@ Read on to expand your understanding and learn about DMS's configuration, includ
 <li>Outbound Submission (self-owned email is submitted directly to the MTA, then is relayed "outside")</li>
 <li>Inbound Submission (third-party email has been submitted &amp; relayed, then is accepted "inside" by the MTA)</li>
 </ul>
-<div class="highlight"><pre><span></span><code> ┏━━━━ Outbound Submission ━━━━┓
+<div class="highlight"><pre><span></span><code>  ┏━━━ Outbound Submission ━━━┓

                    ┌────────────────────┐                    ┌┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┐
 Me ---------------&gt; ┤                    ├ -----------------&gt; ┊                 ┊
@ -2183,7 +2183,7 @@ Me ---------------&gt; ┤                    ├ -----------------&gt; ┊
 <li>One may also secure Inbound Submission using advanced encryption scheme, such as DANE/DNSSEC and/or MTA-STS.</li>
 </ul>
 <p>Overall, DMS's default configuration for SMTP looks like this:</p>
-<div class="highlight"><pre><span></span><code> ┏━━━━ Outbound Submission ━━━━┓
+<div class="highlight"><pre><span></span><code>  ┏━━━ Outbound Submission ━━━┓

                    ┌────────────────────┐                    ┌┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┐
 Me -- cleartext --&gt; ┤(25)            (25)├ --- cleartext ---&gt; ┊                 ┊
--- a/edge/search/search_index.json
+++ b/edge/search/search_index.json
--- a/edge/sitemap.xml
+++ b/edge/sitemap.xml
@ -2,212 +2,212 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/faq/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/introduction/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/usage/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/debugging/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/environment/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/pop3/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/setup.sh/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/user-management/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/auth-ldap/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/dovecot-master-accounts/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/full-text-search/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/ipv6/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/kubernetes/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-fetchmail/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-getmail/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-sieve/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/optional-config/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/podman/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-forwarding/aws-ses/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-forwarding/relay-hosts/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/maintenance/update-and-cleanup/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/override-defaults/dovecot/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/override-defaults/postfix/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/override-defaults/user-patches/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/best-practices/autodiscover/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/best-practices/dkim_dmarc_spf/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/fail2ban/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/mail_crypt/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/rspamd/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/ssl/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/understanding-the-ports/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/contributing/general/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/contributing/issues-and-pull-requests/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/contributing/tests/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/basic-installation/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/blog-posts/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/docker-build/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/mailserver-behind-proxy/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/use-cases/forward-only-mailserver-with-ldap-authentication/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/use-cases/imap-folders/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
    <url>
         <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/use-cases/ios-mail-push-support/</loc>
-         <lastmod>2023-09-30</lastmod>
+         <lastmod>2023-10-04</lastmod>
         <changefreq>daily</changefreq>
    </url>
 </urlset>