docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Libre Developers Documentation 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-01 14:19-0600\n"
+"POT-Creation-Date: 2024-09-01 12:47-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "MariaDB"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:28 ../../../_source/mail-libre-is.rst:643
+#: ../../../_source/mail-libre-is.rst:28 ../../../_source/mail-libre-is.rst:452
 msgid "OpenDKIM"
 msgstr ""
 
@@ -70,7 +70,7 @@ msgstr ""
 msgid "`<http://www.opendkim.org/>`_"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:32 ../../../_source/mail-libre-is.rst:651
+#: ../../../_source/mail-libre-is.rst:32 ../../../_source/mail-libre-is.rst:460
 msgid "OpenDMARC"
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 msgid "`<https://www.postfix.org/>`_"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:44 ../../../_source/mail-libre-is.rst:666
+#: ../../../_source/mail-libre-is.rst:44 ../../../_source/mail-libre-is.rst:475
 msgid "DNS"
 msgstr ""
 
@@ -290,155 +290,131 @@ msgstr ""
 msgid "Make sure all is good:"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:452
+#: ../../../_source/mail-libre-is.rst:461
-msgid "rspamd Configuration"
+msgid "Requires database setup."
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:453
+#: ../../../_source/mail-libre-is.rst:470
-msgid "Configure postfix for rspamd."
+msgid "SPF"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:463
+#: ../../../_source/mail-libre-is.rst:471
+msgid "Set up SPF."
+msgstr ""
+
+#: ../../../_source/mail-libre-is.rst:476
+msgid "Set up DNS."
+msgstr ""
+
+#: ../../../_source/mail-libre-is.rst:481
 msgid "Administration"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:464
+#: ../../../_source/mail-libre-is.rst:482
 msgid "Now that everything is working..."
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:466
+#: ../../../_source/mail-libre-is.rst:484
 msgid "Log into the database using the mailadmin databse password:"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:474
+#: ../../../_source/mail-libre-is.rst:492
 msgid "List Virtual Domains"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:482
+#: ../../../_source/mail-libre-is.rst:500
 msgid "List Virtual Users"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:490
+#: ../../../_source/mail-libre-is.rst:508
 msgid "List Virtual Aliases"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:498
+#: ../../../_source/mail-libre-is.rst:516
 msgid "Add Virtual Domain"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:500
+#: ../../../_source/mail-libre-is.rst:518
 msgid "Add the domain:"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:508
+#: ../../../_source/mail-libre-is.rst:526
 msgid "Add a Mail User"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:509
+#: ../../../_source/mail-libre-is.rst:527
 msgid "Generate a password with dovecot:"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:515
+#: ../../../_source/mail-libre-is.rst:533
 msgid ""
 "Log into database as mailadmin and run this command, using the dovecot "
 "generated password string, and set the domain and user email."
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:518
+#: ../../../_source/mail-libre-is.rst:536
 msgid "Note, upstream docs are missing \"(\" and \")\" for VALUES."
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:528
+#: ../../../_source/mail-libre-is.rst:546
 msgid "Add a User Alias"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:529
+#: ../../../_source/mail-libre-is.rst:547
 msgid ""
 "Example to add an alias. The first email should be the alias, the second "
 "email is where it should go to."
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:540
+#: ../../../_source/mail-libre-is.rst:558
 msgid "Change a User Password"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:541
+#: ../../../_source/mail-libre-is.rst:559
 msgid "Generate string for new password:"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:547
+#: ../../../_source/mail-libre-is.rst:565
 msgid "Use that string:"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:555
+#: ../../../_source/mail-libre-is.rst:573
 msgid "Delete Virtual Domain"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:563
+#: ../../../_source/mail-libre-is.rst:581
 msgid "Delete User"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:571
+#: ../../../_source/mail-libre-is.rst:589
 msgid "Delete Alias"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:579
+#: ../../../_source/mail-libre-is.rst:597
-msgid "Firewall"
-msgstr ""
-
-#: ../../../_source/mail-libre-is.rst:580
-msgid "Open TCP ports."
-msgstr ""
-
-#: ../../../_source/mail-libre-is.rst:582
-msgid "Confirm open sieve..."
-msgstr ""
-
-#: ../../../_source/mail-libre-is.rst:602
-msgid "Email Client Setup"
-msgstr ""
-
-#: ../../../_source/mail-libre-is.rst:603
-msgid "Set up mail clients thusly."
-msgstr ""
-
-#: ../../../_source/mail-libre-is.rst:607
-msgid "Thunderbird"
-msgstr ""
-
-#: ../../../_source/mail-libre-is.rst:608
-msgid "Example email Address: username@libre.is"
-msgstr ""
-
-#: ../../../_source/mail-libre-is.rst:629
 msgid "Other"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:630
+#: ../../../_source/mail-libre-is.rst:598
 msgid "Perhaps these too."
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:637
+#: ../../../_source/mail-libre-is.rst:607
-msgid "Perhaps easier to admin with this script."
+msgid "Firewall"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:639
+#: ../../../_source/mail-libre-is.rst:608
-msgid "`<https://github.com/cgzones/ispmail-userctl>`_"
+msgid "Open TCP ports."
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:652
+#: ../../../_source/mail-libre-is.rst:610
-msgid "Requires database setup."
+msgid "Confirm open sieve..."
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:661
+#: ../../../_source/mail-libre-is.rst:630
-msgid "SPF"
+msgid "Email Client Setup"
 msgstr ""
 
-#: ../../../_source/mail-libre-is.rst:662
+#: ../../../_source/mail-libre-is.rst:631
-msgid "Set up SPF."
+msgid "Thusly:"
-msgstr ""
-
-#: ../../../_source/mail-libre-is.rst:667
-msgid "Set up DNS."
 msgstr ""
 

docs/_source/mail-libre-is.rst

@@ -448,15 +448,33 @@ Make sure all is good:
   sudo postfix check
 
 
-rspamd Configuration
+OpenDKIM
-====================
+========
-Configure postfix for rspamd.
 
 .. code-block:: sh
 
-  sudo postconf smtpd_milters=inet:127.0.0.1:11332
+  sudo apt install opendkim
-  sudo postconf non_smtpd_milters=inet:127.0.0.1:11332
+
-  sudo postconf milter_mail_macros="i {mail_addr} {client_addr} {client_name} {auth_authen}"
+
+OpenDMARC
+=========
+Requires database setup.
+
+
+.. code-block:: sh
+
+  sudo apt install opendmarc
+
+
+SPF
+===
+Set up SPF.
+
+
+DNS
+===
+Set up DNS.
+
 
 
 Administration
@@ -575,6 +593,16 @@ Delete Alias
   DELETE FROM virtual_aliases WHERE source='melissa@example.org';
 
 
+Other
+=====
+Perhaps these too.
+
+.. code-block:: sh
+
+  apt install postfix-policyd-spf-python rspamd
+  apt install fail2ban spamassassin sqlgrey opendkim-tools make
+
+
 Firewall
 ========
 Open TCP ports.
@@ -600,70 +628,6 @@ Confirm open sieve...
 
 Email Client Setup
 ==================
-Set up mail clients thusly.
+Thusly:
-
-
-Thunderbird
------------
-Example email Address: username@libre.is
-
-.. code-block:: cfg
-
-  Incoming Server
-  Hostname: mail.libre.is
-  Protocol: IMAP
-  Port: 993
-  Connection Security: SSL/TLS
-  Authenication Method: Normal Password
-  Username: username@libre.is (same as email address)
-  
-  Outgoing Server
-  Hostname: mail.libre.is
-  Port: 587
-  Connection Security: STARTTLS
-  Authenication Method: Normal Password
-  Username: username@libre.is (same as email address)
-
-
-Other
-=====
-Perhaps these too.
-
-.. code-block:: sh
-
-  apt install postfix-policyd-spf-python rspamd
-  apt install fail2ban spamassassin sqlgrey opendkim-tools make
-
-Perhaps easier to admin with this script.
-
-  `<https://github.com/cgzones/ispmail-userctl>`_
-
-
-OpenDKIM
-========
-
-.. code-block:: sh
-
-  sudo apt install opendkim
-
-
-OpenDMARC
-=========
-Requires database setup.
-
-
-.. code-block:: sh
-
-  sudo apt install opendmarc
-
-
-SPF
-===
-Set up SPF.
-
-
-DNS
-===
-Set up DNS.