From a5db3e816a5d054b5eff6a603fba9f5b6501e79b Mon Sep 17 00:00:00 2001 From: Jeff Moe Date: Sun, 1 Sep 2024 14:19:56 -0600 Subject: [PATCH] reorder mail page --- .../locale/en/LC_MESSAGES/mail-libre-is.po | 107 +++++++++--------- docs/_source/mail-libre-is.rst | 64 ++++++----- 2 files changed, 90 insertions(+), 81 deletions(-) diff --git a/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po b/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po index 76a9803..c96e76c 100644 --- a/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po +++ b/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:18-0600\n" +"POT-Creation-Date: 2024-09-01 14:19-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -62,7 +62,7 @@ msgstr "" msgid "MariaDB" msgstr "" -#: ../../../_source/mail-libre-is.rst:28 ../../../_source/mail-libre-is.rst:452 +#: ../../../_source/mail-libre-is.rst:28 ../../../_source/mail-libre-is.rst:643 msgid "OpenDKIM" msgstr "" @@ -70,7 +70,7 @@ msgstr "" msgid "``_" msgstr "" -#: ../../../_source/mail-libre-is.rst:32 ../../../_source/mail-libre-is.rst:460 +#: ../../../_source/mail-libre-is.rst:32 ../../../_source/mail-libre-is.rst:651 msgid "OpenDMARC" msgstr "" @@ -90,7 +90,7 @@ msgstr "" msgid "``_" msgstr "" -#: ../../../_source/mail-libre-is.rst:44 ../../../_source/mail-libre-is.rst:475 +#: ../../../_source/mail-libre-is.rst:44 ../../../_source/mail-libre-is.rst:666 msgid "DNS" msgstr "" @@ -290,154 +290,155 @@ msgstr "" msgid "Make sure all is good:" msgstr "" -#: ../../../_source/mail-libre-is.rst:461 -msgid "Requires database setup." +#: ../../../_source/mail-libre-is.rst:452 +msgid "rspamd Configuration" msgstr "" -#: ../../../_source/mail-libre-is.rst:470 -msgid "SPF" +#: ../../../_source/mail-libre-is.rst:453 +msgid "Configure postfix for rspamd." msgstr "" -#: ../../../_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 +#: ../../../_source/mail-libre-is.rst:463 msgid "Administration" msgstr "" -#: ../../../_source/mail-libre-is.rst:482 +#: ../../../_source/mail-libre-is.rst:464 msgid "Now that everything is working..." msgstr "" -#: ../../../_source/mail-libre-is.rst:484 +#: ../../../_source/mail-libre-is.rst:466 msgid "Log into the database using the mailadmin databse password:" msgstr "" -#: ../../../_source/mail-libre-is.rst:492 +#: ../../../_source/mail-libre-is.rst:474 msgid "List Virtual Domains" msgstr "" -#: ../../../_source/mail-libre-is.rst:500 +#: ../../../_source/mail-libre-is.rst:482 msgid "List Virtual Users" msgstr "" -#: ../../../_source/mail-libre-is.rst:508 +#: ../../../_source/mail-libre-is.rst:490 msgid "List Virtual Aliases" msgstr "" -#: ../../../_source/mail-libre-is.rst:516 +#: ../../../_source/mail-libre-is.rst:498 msgid "Add Virtual Domain" msgstr "" -#: ../../../_source/mail-libre-is.rst:518 +#: ../../../_source/mail-libre-is.rst:500 msgid "Add the domain:" msgstr "" -#: ../../../_source/mail-libre-is.rst:526 +#: ../../../_source/mail-libre-is.rst:508 msgid "Add a Mail User" msgstr "" -#: ../../../_source/mail-libre-is.rst:527 +#: ../../../_source/mail-libre-is.rst:509 msgid "Generate a password with dovecot:" msgstr "" -#: ../../../_source/mail-libre-is.rst:533 +#: ../../../_source/mail-libre-is.rst:515 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:536 +#: ../../../_source/mail-libre-is.rst:518 msgid "Note, upstream docs are missing \"(\" and \")\" for VALUES." msgstr "" -#: ../../../_source/mail-libre-is.rst:546 +#: ../../../_source/mail-libre-is.rst:528 msgid "Add a User Alias" msgstr "" -#: ../../../_source/mail-libre-is.rst:547 +#: ../../../_source/mail-libre-is.rst:529 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:558 +#: ../../../_source/mail-libre-is.rst:540 msgid "Change a User Password" msgstr "" -#: ../../../_source/mail-libre-is.rst:559 +#: ../../../_source/mail-libre-is.rst:541 msgid "Generate string for new password:" msgstr "" -#: ../../../_source/mail-libre-is.rst:565 +#: ../../../_source/mail-libre-is.rst:547 msgid "Use that string:" msgstr "" -#: ../../../_source/mail-libre-is.rst:573 +#: ../../../_source/mail-libre-is.rst:555 msgid "Delete Virtual Domain" msgstr "" -#: ../../../_source/mail-libre-is.rst:581 +#: ../../../_source/mail-libre-is.rst:563 msgid "Delete User" msgstr "" -#: ../../../_source/mail-libre-is.rst:589 +#: ../../../_source/mail-libre-is.rst:571 msgid "Delete Alias" msgstr "" -#: ../../../_source/mail-libre-is.rst:597 -msgid "rspamd Configuration" -msgstr "" - -#: ../../../_source/mail-libre-is.rst:601 +#: ../../../_source/mail-libre-is.rst:579 msgid "Firewall" msgstr "" -#: ../../../_source/mail-libre-is.rst:602 +#: ../../../_source/mail-libre-is.rst:580 msgid "Open TCP ports." msgstr "" -#: ../../../_source/mail-libre-is.rst:604 +#: ../../../_source/mail-libre-is.rst:582 msgid "Confirm open sieve..." msgstr "" -#: ../../../_source/mail-libre-is.rst:624 +#: ../../../_source/mail-libre-is.rst:602 msgid "Email Client Setup" msgstr "" -#: ../../../_source/mail-libre-is.rst:625 +#: ../../../_source/mail-libre-is.rst:603 msgid "Set up mail clients thusly." msgstr "" -#: ../../../_source/mail-libre-is.rst:629 +#: ../../../_source/mail-libre-is.rst:607 msgid "Thunderbird" msgstr "" -#: ../../../_source/mail-libre-is.rst:630 +#: ../../../_source/mail-libre-is.rst:608 msgid "Example email Address: username@libre.is" msgstr "" -#: ../../../_source/mail-libre-is.rst:651 +#: ../../../_source/mail-libre-is.rst:629 msgid "Other" msgstr "" -#: ../../../_source/mail-libre-is.rst:652 +#: ../../../_source/mail-libre-is.rst:630 msgid "Perhaps these too." msgstr "" -#: ../../../_source/mail-libre-is.rst:659 +#: ../../../_source/mail-libre-is.rst:637 msgid "Perhaps easier to admin with this script." msgstr "" -#: ../../../_source/mail-libre-is.rst:661 +#: ../../../_source/mail-libre-is.rst:639 msgid "``_" msgstr "" -#~ msgid "Email Address: username@libre.is" -#~ msgstr "" +#: ../../../_source/mail-libre-is.rst:652 +msgid "Requires database setup." +msgstr "" + +#: ../../../_source/mail-libre-is.rst:661 +msgid "SPF" +msgstr "" + +#: ../../../_source/mail-libre-is.rst:662 +msgid "Set up SPF." +msgstr "" + +#: ../../../_source/mail-libre-is.rst:667 +msgid "Set up DNS." +msgstr "" diff --git a/docs/_source/mail-libre-is.rst b/docs/_source/mail-libre-is.rst index de01e85..bef2f67 100644 --- a/docs/_source/mail-libre-is.rst +++ b/docs/_source/mail-libre-is.rst @@ -448,33 +448,15 @@ Make sure all is good: sudo postfix check -OpenDKIM -======== +rspamd Configuration +==================== +Configure postfix for rspamd. .. 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. - + sudo postconf smtpd_milters=inet:127.0.0.1:11332 + 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}" Administration @@ -593,10 +575,6 @@ Delete Alias DELETE FROM virtual_aliases WHERE source='melissa@example.org'; -rspamd Configuration -==================== - - Firewall ======== Open TCP ports. @@ -659,3 +637,33 @@ Perhaps these too. Perhaps easier to admin with this script. ``_ + + +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. + +