From 79e4259280a7d2391117a810ad6e7df3e8ab8560 Mon Sep 17 00:00:00 2001 From: Jeff Moe Date: Sun, 1 Sep 2024 15:25:00 -0600 Subject: [PATCH] domainkey, reorder --- .../locale/en/LC_MESSAGES/mail-libre-is.po | 229 +++++++++--------- docs/_source/mail-libre-is.rst | 69 +++--- 2 files changed, 148 insertions(+), 150 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 6c0c007..3de2bb5 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 15:12-0600\n" +"POT-Creation-Date: 2024-09-01 15:24-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -51,7 +51,7 @@ msgid "" "For more information and details about what is what, refer to that site." msgstr "" -#: ../../../_source/mail-libre-is.rst:20 ../../../_source/mail-libre-is.rst:231 +#: ../../../_source/mail-libre-is.rst:20 ../../../_source/mail-libre-is.rst:252 msgid "Dovecot" msgstr "" @@ -59,11 +59,11 @@ msgstr "" msgid "``_" msgstr "" -#: ../../../_source/mail-libre-is.rst:25 ../../../_source/mail-libre-is.rst:77 +#: ../../../_source/mail-libre-is.rst:25 ../../../_source/mail-libre-is.rst:98 msgid "MariaDB" msgstr "" -#: ../../../_source/mail-libre-is.rst:28 ../../../_source/mail-libre-is.rst:798 +#: ../../../_source/mail-libre-is.rst:28 ../../../_source/mail-libre-is.rst:815 msgid "OpenDMARC" msgstr "" @@ -75,7 +75,7 @@ msgstr "" msgid "``_" msgstr "" -#: ../../../_source/mail-libre-is.rst:34 ../../../_source/mail-libre-is.rst:129 +#: ../../../_source/mail-libre-is.rst:34 ../../../_source/mail-libre-is.rst:150 msgid "Postfix" msgstr "" @@ -105,425 +105,422 @@ msgid "" msgstr "" #: ../../../_source/mail-libre-is.rst:63 -msgid "Apache" +msgid "Firewall" msgstr "" #: ../../../_source/mail-libre-is.rst:64 +msgid "Open TCP ports." +msgstr "" + +#: ../../../_source/mail-libre-is.rst:84 +msgid "Apache" +msgstr "" + +#: ../../../_source/mail-libre-is.rst:85 msgid "" "The Apache webserver is used out of laziness as it allows easy certificate " "updates with certbot. A webmail server won't be running on the main mail " "server." msgstr "" -#: ../../../_source/mail-libre-is.rst:73 +#: ../../../_source/mail-libre-is.rst:94 msgid "Open up firewall ports 80 and 443." msgstr "" -#: ../../../_source/mail-libre-is.rst:78 +#: ../../../_source/mail-libre-is.rst:99 msgid "The main database server." msgstr "" -#: ../../../_source/mail-libre-is.rst:86 +#: ../../../_source/mail-libre-is.rst:107 msgid "Add databases. Change password to something secure." msgstr "" -#: ../../../_source/mail-libre-is.rst:130 +#: ../../../_source/mail-libre-is.rst:151 msgid "The main SMTP mail server." msgstr "" -#: ../../../_source/mail-libre-is.rst:137 +#: ../../../_source/mail-libre-is.rst:158 msgid "" "Set up postfix to use MariaDB. Edit /etc/postfix/mysql-virtual-mailbox-" "domains.cf and add below, using the mailserver password used in MariaDB." msgstr "" -#: ../../../_source/mail-libre-is.rst:150 +#: ../../../_source/mail-libre-is.rst:171 msgid "Edit /etc/postfix/mysql-virtual-mailbox-maps.cf and add below contents:" msgstr "" -#: ../../../_source/mail-libre-is.rst:160 +#: ../../../_source/mail-libre-is.rst:181 msgid "Edit /etc/postfix/mysql-virtual-alias-maps.cf and add below:" msgstr "" -#: ../../../_source/mail-libre-is.rst:170 +#: ../../../_source/mail-libre-is.rst:191 msgid "Edit /etc/postfix/mysql-email2email.cf and add:" msgstr "" -#: ../../../_source/mail-libre-is.rst:180 +#: ../../../_source/mail-libre-is.rst:201 msgid "Then run these commands:" msgstr "" -#: ../../../_source/mail-libre-is.rst:197 +#: ../../../_source/mail-libre-is.rst:218 msgid "Redis" msgstr "" -#: ../../../_source/mail-libre-is.rst:198 +#: ../../../_source/mail-libre-is.rst:219 msgid "" "Note, the licensing of Redis has gone bad. The version in Debian is OK. But " "in the future, probably replace with a fork." msgstr "" -#: ../../../_source/mail-libre-is.rst:207 +#: ../../../_source/mail-libre-is.rst:228 msgid "rspamd" msgstr "" -#: ../../../_source/mail-libre-is.rst:208 +#: ../../../_source/mail-libre-is.rst:229 msgid "Spam control." msgstr "" -#: ../../../_source/mail-libre-is.rst:216 +#: ../../../_source/mail-libre-is.rst:237 msgid "Certbot" msgstr "" -#: ../../../_source/mail-libre-is.rst:217 +#: ../../../_source/mail-libre-is.rst:238 msgid "" "Encryption certificates with Let's Encrypt. Not using an Apache webserver on " "the mail server makes getting new certificates a bit more complex." msgstr "" -#: ../../../_source/mail-libre-is.rst:232 +#: ../../../_source/mail-libre-is.rst:253 msgid "Just using encrypted IMAPS, not POP." msgstr "" -#: ../../../_source/mail-libre-is.rst:239 +#: ../../../_source/mail-libre-is.rst:260 msgid "" "Note, since IPv6 isn't being used, the dovecot install barfs. Edit /etc/" "dovecot/dovecot.conf and add this line, where appropriate:" msgstr "" -#: ../../../_source/mail-libre-is.rst:246 +#: ../../../_source/mail-libre-is.rst:267 msgid "" "Note, this is removing the \"::\" from listen, which using IPv6. Then re-run " "the install so the packages are happy. Note, the re-install won't overwrite " "the \"listen\" change." msgstr "" -#: ../../../_source/mail-libre-is.rst:255 +#: ../../../_source/mail-libre-is.rst:276 msgid "Add user and set up configs" msgstr "" -#: ../../../_source/mail-libre-is.rst:283 +#: ../../../_source/mail-libre-is.rst:304 msgid "Edit /etc/dovecot/conf.d/10-master.conf and add:" msgstr "" -#: ../../../_source/mail-libre-is.rst:294 +#: ../../../_source/mail-libre-is.rst:315 msgid "" "Edit /etc/dovecot/conf.d/10-ssl.conf, set key locations, and make it " "required." msgstr "" -#: ../../../_source/mail-libre-is.rst:303 +#: ../../../_source/mail-libre-is.rst:324 msgid "" "Edit /etc/dovecot/dovecot-sql.conf.ext file and add these lines at the " "bottom, changing the password to the mailserver database password." msgstr "" -#: ../../../_source/mail-libre-is.rst:326 +#: ../../../_source/mail-libre-is.rst:347 msgid "Set file permissions." msgstr "" -#: ../../../_source/mail-libre-is.rst:333 +#: ../../../_source/mail-libre-is.rst:354 msgid "Edit /etc/dovecot/conf.d/10-master.conf and change to:" msgstr "" -#: ../../../_source/mail-libre-is.rst:346 +#: ../../../_source/mail-libre-is.rst:367 msgid "Restart dovecot server." msgstr "" -#: ../../../_source/mail-libre-is.rst:352 +#: ../../../_source/mail-libre-is.rst:373 msgid "Run this to tell postfix to deliver to dovecot:" msgstr "" -#: ../../../_source/mail-libre-is.rst:358 +#: ../../../_source/mail-libre-is.rst:379 msgid "Edit /etc/dovecot/conf.d/20-lmtp.conf and change line like this:" msgstr "" -#: ../../../_source/mail-libre-is.rst:365 +#: ../../../_source/mail-libre-is.rst:386 msgid "Restart dovecot again...." msgstr "" -#: ../../../_source/mail-libre-is.rst:373 +#: ../../../_source/mail-libre-is.rst:394 msgid "More postfix" msgstr "" -#: ../../../_source/mail-libre-is.rst:374 +#: ../../../_source/mail-libre-is.rst:395 msgid "More postfix configuration, now that the above is set up." msgstr "" -#: ../../../_source/mail-libre-is.rst:376 +#: ../../../_source/mail-libre-is.rst:397 msgid "Set postfix to use dovecot for authentication:" msgstr "" -#: ../../../_source/mail-libre-is.rst:390 +#: ../../../_source/mail-libre-is.rst:411 msgid "Edit /etc/postfix/master.cf and change thusly:" msgstr "" -#: ../../../_source/mail-libre-is.rst:407 -#: ../../../_source/mail-libre-is.rst:534 +#: ../../../_source/mail-libre-is.rst:428 +#: ../../../_source/mail-libre-is.rst:555 msgid "Run:" msgstr "" -#: ../../../_source/mail-libre-is.rst:413 +#: ../../../_source/mail-libre-is.rst:434 msgid "Restart postfix:" msgstr "" -#: ../../../_source/mail-libre-is.rst:419 +#: ../../../_source/mail-libre-is.rst:440 msgid "" "Does it ever end? Edit /etc/postfix/master.cf and add to bottom of " "submission section." msgstr "" -#: ../../../_source/mail-libre-is.rst:431 +#: ../../../_source/mail-libre-is.rst:452 msgid "" "Allow aliases to send by adding this file (XXX check OK) /etc/postfix/" "aliases.cf with this contents:" msgstr "" -#: ../../../_source/mail-libre-is.rst:439 +#: ../../../_source/mail-libre-is.rst:460 msgid "Make sure all is good:" msgstr "" -#: ../../../_source/mail-libre-is.rst:447 +#: ../../../_source/mail-libre-is.rst:468 msgid "rspamd Configuration" msgstr "" -#: ../../../_source/mail-libre-is.rst:448 +#: ../../../_source/mail-libre-is.rst:469 msgid "Configure postfix for rspamd." msgstr "" -#: ../../../_source/mail-libre-is.rst:456 +#: ../../../_source/mail-libre-is.rst:477 msgid "Edit /etc/rspamd/override.d/milter_headers.conf and add:" msgstr "" -#: ../../../_source/mail-libre-is.rst:462 +#: ../../../_source/mail-libre-is.rst:483 msgid "Edit /etc/dovecot/conf.d/90-sieve.conf and change:" msgstr "" -#: ../../../_source/mail-libre-is.rst:468 +#: ../../../_source/mail-libre-is.rst:489 msgid "Create dir for new sieve filter:" msgstr "" -#: ../../../_source/mail-libre-is.rst:474 +#: ../../../_source/mail-libre-is.rst:495 msgid "" "Create /etc/dovecot/sieve-after/spam-to-folder.sieve with these contents:" msgstr "" -#: ../../../_source/mail-libre-is.rst:485 +#: ../../../_source/mail-libre-is.rst:506 msgid "Then compile it:" msgstr "" -#: ../../../_source/mail-libre-is.rst:491 +#: ../../../_source/mail-libre-is.rst:512 msgid "Set up redis by adding /etc/rspamd/override.d/redis.conf with this:" msgstr "" -#: ../../../_source/mail-libre-is.rst:497 +#: ../../../_source/mail-libre-is.rst:518 msgid "" "Add this /etc/rspamd/override.d/classifier-bayes.conf with below contents:" msgstr "" -#: ../../../_source/mail-libre-is.rst:503 +#: ../../../_source/mail-libre-is.rst:524 msgid "Add /etc/rspamd/local.d/classifier-bayes.conf with:" msgstr "" -#: ../../../_source/mail-libre-is.rst:509 +#: ../../../_source/mail-libre-is.rst:530 msgid "Edit /etc/dovecot/conf.d/20-imap.conf and change:" msgstr "" -#: ../../../_source/mail-libre-is.rst:515 +#: ../../../_source/mail-libre-is.rst:536 msgid "" "Edit /etc/dovecot/conf.d/90-sieve.conf and add below to \"plugins\" section:" msgstr "" -#: ../../../_source/mail-libre-is.rst:540 +#: ../../../_source/mail-libre-is.rst:561 msgid "Create /etc/dovecot/sieve/learn-spam.sieve with contents:" msgstr "" -#: ../../../_source/mail-libre-is.rst:547 +#: ../../../_source/mail-libre-is.rst:568 msgid "Create /etc/dovecot/sieve/learn-ham.sieve and add:" msgstr "" -#: ../../../_source/mail-libre-is.rst:561 +#: ../../../_source/mail-libre-is.rst:582 msgid "Run this to compile:" msgstr "" -#: ../../../_source/mail-libre-is.rst:570 +#: ../../../_source/mail-libre-is.rst:591 msgid "Create /etc/dovecot/sieve/rspamd-learn-spam.sh with contents:" msgstr "" -#: ../../../_source/mail-libre-is.rst:577 +#: ../../../_source/mail-libre-is.rst:598 msgid "Create /etc/dovecot/sieve/rspamd-learn-ham.sh with contents:" msgstr "" -#: ../../../_source/mail-libre-is.rst:584 +#: ../../../_source/mail-libre-is.rst:605 msgid "Set ownership and permissions on scripts:" msgstr "" -#: ../../../_source/mail-libre-is.rst:593 +#: ../../../_source/mail-libre-is.rst:614 msgid "Unbound" msgstr "" -#: ../../../_source/mail-libre-is.rst:594 +#: ../../../_source/mail-libre-is.rst:615 msgid "" "For proper spam filtering with rspam, unbound DNS resolver should be used." msgstr "" -#: ../../../_source/mail-libre-is.rst:600 +#: ../../../_source/mail-libre-is.rst:621 msgid "Change /etc/resolv.conf to:" msgstr "" -#: ../../../_source/mail-libre-is.rst:607 +#: ../../../_source/mail-libre-is.rst:628 msgid "Also add to /etc/rspamd/local.d/options.inc" msgstr "" -#: ../../../_source/mail-libre-is.rst:617 -msgid "Firewall" +#: ../../../_source/mail-libre-is.rst:638 +msgid "DKIM" msgstr "" -#: ../../../_source/mail-libre-is.rst:618 -msgid "Open TCP ports." +#: ../../../_source/mail-libre-is.rst:639 +msgid "Set up DNS for DKIM." msgstr "" -#: ../../../_source/mail-libre-is.rst:620 -msgid "Confirm open sieve..." +#: ../../../_source/mail-libre-is.rst:648 +msgid "" +"Add a 2024090101._domainkey TXT DNS record at the ISP, with contents of the " +"\"p=\" and the rest, for example:" msgstr "" -#: ../../../_source/mail-libre-is.rst:640 +#: ../../../_source/mail-libre-is.rst:657 msgid "Administration" msgstr "" -#: ../../../_source/mail-libre-is.rst:641 +#: ../../../_source/mail-libre-is.rst:658 msgid "Now that everything is working..." msgstr "" -#: ../../../_source/mail-libre-is.rst:643 +#: ../../../_source/mail-libre-is.rst:660 msgid "Log into the database using the mailadmin databse password:" msgstr "" -#: ../../../_source/mail-libre-is.rst:651 +#: ../../../_source/mail-libre-is.rst:668 msgid "List Virtual Domains" msgstr "" -#: ../../../_source/mail-libre-is.rst:659 +#: ../../../_source/mail-libre-is.rst:676 msgid "List Virtual Users" msgstr "" -#: ../../../_source/mail-libre-is.rst:667 +#: ../../../_source/mail-libre-is.rst:684 msgid "List Virtual Aliases" msgstr "" -#: ../../../_source/mail-libre-is.rst:675 +#: ../../../_source/mail-libre-is.rst:692 msgid "Add Virtual Domain" msgstr "" -#: ../../../_source/mail-libre-is.rst:677 +#: ../../../_source/mail-libre-is.rst:694 msgid "Add the domain:" msgstr "" -#: ../../../_source/mail-libre-is.rst:685 +#: ../../../_source/mail-libre-is.rst:702 msgid "Add a Mail User" msgstr "" -#: ../../../_source/mail-libre-is.rst:686 +#: ../../../_source/mail-libre-is.rst:703 msgid "Generate a password with dovecot:" msgstr "" -#: ../../../_source/mail-libre-is.rst:692 +#: ../../../_source/mail-libre-is.rst:709 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:695 +#: ../../../_source/mail-libre-is.rst:712 msgid "Note, upstream docs are missing \"(\" and \")\" for VALUES." msgstr "" -#: ../../../_source/mail-libre-is.rst:705 +#: ../../../_source/mail-libre-is.rst:722 msgid "Add a User Alias" msgstr "" -#: ../../../_source/mail-libre-is.rst:706 +#: ../../../_source/mail-libre-is.rst:723 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:717 +#: ../../../_source/mail-libre-is.rst:734 msgid "Change a User Password" msgstr "" -#: ../../../_source/mail-libre-is.rst:718 +#: ../../../_source/mail-libre-is.rst:735 msgid "Generate string for new password:" msgstr "" -#: ../../../_source/mail-libre-is.rst:724 +#: ../../../_source/mail-libre-is.rst:741 msgid "Use that string:" msgstr "" -#: ../../../_source/mail-libre-is.rst:732 +#: ../../../_source/mail-libre-is.rst:749 msgid "Delete Virtual Domain" msgstr "" -#: ../../../_source/mail-libre-is.rst:740 +#: ../../../_source/mail-libre-is.rst:757 msgid "Delete User" msgstr "" -#: ../../../_source/mail-libre-is.rst:748 +#: ../../../_source/mail-libre-is.rst:765 msgid "Delete Alias" msgstr "" -#: ../../../_source/mail-libre-is.rst:756 +#: ../../../_source/mail-libre-is.rst:773 msgid "Email Client Setup" msgstr "" -#: ../../../_source/mail-libre-is.rst:757 +#: ../../../_source/mail-libre-is.rst:774 msgid "Set up mail clients thusly." msgstr "" -#: ../../../_source/mail-libre-is.rst:761 +#: ../../../_source/mail-libre-is.rst:778 msgid "Thunderbird" msgstr "" -#: ../../../_source/mail-libre-is.rst:762 +#: ../../../_source/mail-libre-is.rst:779 msgid "Example email Address: username@libre.is" msgstr "" -#: ../../../_source/mail-libre-is.rst:783 +#: ../../../_source/mail-libre-is.rst:800 msgid "Other" msgstr "" -#: ../../../_source/mail-libre-is.rst:784 +#: ../../../_source/mail-libre-is.rst:801 msgid "Perhaps these too." msgstr "" -#: ../../../_source/mail-libre-is.rst:791 +#: ../../../_source/mail-libre-is.rst:808 msgid "Perhaps easier to admin with this script." msgstr "" -#: ../../../_source/mail-libre-is.rst:793 +#: ../../../_source/mail-libre-is.rst:810 msgid "``_" msgstr "" -#: ../../../_source/mail-libre-is.rst:799 +#: ../../../_source/mail-libre-is.rst:816 msgid "Requires database setup." msgstr "" -#: ../../../_source/mail-libre-is.rst:808 +#: ../../../_source/mail-libre-is.rst:825 msgid "SPF" msgstr "" -#: ../../../_source/mail-libre-is.rst:809 +#: ../../../_source/mail-libre-is.rst:826 msgid "Set up SPF." msgstr "" - -#: ../../../_source/mail-libre-is.rst:813 -msgid "DKIM" -msgstr "" - -#: ../../../_source/mail-libre-is.rst:814 -msgid "Set up DNS for DKIM." -msgstr "" - -#: ../../../_source/mail-libre-is.rst:823 -msgid "" -"Add a 2024090101._domainkey TXT DNS record at the ISP, along the lines of:" -msgstr "" diff --git a/docs/_source/mail-libre-is.rst b/docs/_source/mail-libre-is.rst index bc689ff..5c48e09 100644 --- a/docs/_source/mail-libre-is.rst +++ b/docs/_source/mail-libre-is.rst @@ -59,6 +59,27 @@ Install rsyslog for old school convenience: sudo apt install rsyslog +Firewall +======== +Open TCP ports. + +.. code-block:: sh + + # Web + -A INPUT -p tcp --dport 80 -j ACCEPT + -A INPUT -p tcp --dport 443 -j ACCEPT + + # Postfix + -A INPUT -p tcp --dport 25 -j ACCEPT + -A INPUT -p tcp --dport 587 -j ACCEPT + + # Dovecot imaps + -A INPUT -p tcp --dport 993 -j ACCEPT + + # Dovecot sieve + -A INPUT -p tcp --dport 4190 -j ACCEPT + + Apache ====== The Apache webserver is used out of laziness as it allows easy @@ -613,27 +634,23 @@ Also add to /etc/rspamd/local.d/options.inc } -Firewall -======== -Open TCP ports. - -Confirm open sieve... +DKIM +==== +Set up DNS for DKIM. .. code-block:: sh - # Web - -A INPUT -p tcp --dport 80 -j ACCEPT - -A INPUT -p tcp --dport 443 -j ACCEPT - - # Postfix - -A INPUT -p tcp --dport 25 -j ACCEPT - -A INPUT -p tcp --dport 587 -j ACCEPT - - # Dovecot imaps - -A INPUT -p tcp --dport 993 -j ACCEPT - - # Dovecot sieve - -A INPUT -p tcp --dport 4190 -j ACCEPT + sudo apt install dnsutils + sudo mkdir /var/lib/rspamd/dkim + sudo chown _rspamd:_rspamd /var/lib/rspamd/dkim + sudo rspamadm dkim_keygen -d libre.is -s 2024090101 + +Add a 2024090101._domainkey TXT DNS record at the ISP, with contents of the "p=" +and the rest, for example: + +.. code-block:: cfg + + p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxenHupkYLPmFMbJjV9dQICKUl2xH/aexSRUwCuw7TJ9dkddqIN+6tyw4VKhnW8R0/UlbzlSFLmVgMU0uUkwTtVqyDHhtSU7LV/SkVYmUst4dTUF1r+8PvhAm7vobMYKdwvRsOq27ABtZc8P4oU2XXHqqa6LU8s4sNxs12hLW9swIDAQAB Administration @@ -809,19 +826,3 @@ SPF Set up SPF. -DKIM -==== -Set up DNS for DKIM. - -.. code-block:: sh - - sudo apt install dnsutils - sudo mkdir /var/lib/rspamd/dkim - sudo chown _rspamd:_rspamd /var/lib/rspamd/dkim - sudo rspamadm dkim_keygen -d libre.is -s 2024090101 - -Add a 2024090101._domainkey TXT DNS record at the ISP, along the lines of: - -.. code-block:: cfg - - 2024090101._domainkey ➠p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxenHupkYLPmFMbJjV9dQICKUl2xH/aexSRUwCuw7TJ9dkddqIN+6tyw4VKhnW8R0/UlbzlSFLmVgMU0uUkwTtVqyDHhtSU7LV/SkVYmUst4dTUF1r+8PvhAm7vobMYKdwvRsOq27ABtZc8P4oU2XXHqqa6LU8s4sNxs12hLW9swIDAQAB