-
Notifications
You must be signed in to change notification settings - Fork 315
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Basic email system: Big overhaul of grammar and formatting (Revision 2) #1864
Conversation
@jimcat8 Please review these changes. @wsoyinka I'm not going to approve or merge this PR until I know that it is in its final state. @neelchauhan Thank you for your work! |
@@ -210,32 +232,30 @@ Mysql > insert into virtual_aliases(id,domain_id,source,destination) values(1,1, | |||
Mysql > insert into virtual_aliases(id,domain_id,source,destination) values(2,1,'[email protected]','[email protected]'); | |||
``` | |||
|
|||
Here I have not inserted the ciphertext password for the relevant email users, which requires the use of `doveadm pw -s SHA512-crypt -p twotestandtwo` command. See [here](#ap1) | |||
The password entries for the relevant email users are not shown here, as it requires the use of `doveadm pw -s SHA512-crypt -p twotestandtwo` command. See [here](#ap1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As a translator, I would prefer to put the command in a separate line, e.g., something similar to:
The password entries for the relevant email users are not shown here, as it requires the use of the following command:
doveadm pw -s SHA512-crypt -p twotestandtwo
See here.
What is the meaning of the other translators?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(feel free to modify or revert my suggestions)
|
||
```bash | ||
Shell(192.168.100.7) > systemctl enable --now dovecot | ||
``` | ||
|
||
!!! info |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
!!! info | |
!!! info "Info" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have discussed this before @SergeCroise, but adding the "Info" and "Warning" to custom titles isn't required. In fact, I think we discussed that translators could decide if they wanted to add the translated title to the admonition themselves. If I recall, that was the consensus decision, wasn't it?
@jimcat8: What is it that you don't like about the fenced code-block changes? The title of the fenced code block is a required markdown element (```bash) so I'm guessing that this is not what you are arguing about? Please clarify for @neelchauhan what you don't want. |
Co-authored-by: Serge Croisé <[email protected]>
Co-authored-by: Serge Croisé <[email protected]>
Co-authored-by: Serge Croisé <[email protected]>
!include auth-sql.conf.ext | ||
``` | ||
|
||
```bash | ||
Shell(192.168.100.6) > vim /etc/dovecot/conf.d/10-master.conf | ||
... | ||
Shell(192.168.100.7) > vim /etc/dovecot/conf.d/10-master.conf |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jimcat8 and @neelchauhan
- what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?
Test results for a9c1da2:
|
|
||
Don't write the above grammar on one line, such as this--"userdb {driver = sql args = uid=vmail gid=vmail home=/var/mail/vhosts/%d/%n}". Otherwise, it won't work. | ||
```bash | ||
Shell(192.168.100.7) > vim /etc/dovecot/dovecot-sql.conf.ext |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jimcat8 and @neelchauhan
- what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jimcat8 and @neelchauhan
- what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?
The beginning of the document already indicates that this is an email system composed of three machines.
My idea is not to adjust the basic style or format, but only to change the wording of the text, because the content of this document (02-Basic-Email-Syst.md) is relatively complete. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jimcat8 :
- Please review and confirm that specific IP address changes at the prompt are correct throughout the document(s).
192.168.100.5 Vs 192.168.100.6 Vs. 192.168.100.7
Next, edit the mail storage configuration: | ||
|
||
```bash | ||
Shell(192.168.100.7) > vim /etc/dovecot/conf.d/10-mail.conf |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jimcat8 and @neelchauhan
- what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
192.168.100.6
First, edit the Dovecot configuration: | ||
|
||
```bash | ||
Shell(192.168.100.7) > vim /etc/dovecot/dovecot.conf |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jimcat8 and @neelchauhan . Especially @jimcat8
- what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
192.168.100.6
|
||
```bash | ||
Shell(192.168.100.6) > tree /etc/dovecot/ | ||
Shell(192.168.100.7) > tree /etc/dovecot/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jimcat8 :
- what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
192.168.100.6
Shell(192.168.100.6) > systemctl start postfix.service | ||
Shell(192.168.100.6) > postfix check | ||
Shell(192.168.100.6) > postfix status | ||
Shell(192.168.100.7) > systemctl start postfix.service |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jimcat8 :
- what is the correct IP that should appear here - 192.168.100.6 (original) OR 192.168.100.7 (new) ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
192.168.100.6
ENCRYPT_METHOD SHA512 | ||
``` | ||
|
||
We can see its structure in the /etc/shadow file: | ||
|
||
```bash | ||
Shell(192.168.100.5) > grep -i root /etc/shadow | cut -f 2 -d ":" | ||
Shell(192.168.100.7) > grep -i root /etc/shadow | cut -f 2 -d ":" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jimcat8 :
- what is the correct IP that should appear here - 192.168.100.5 (original) OR 192.168.100.7 (new) ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
192.168.100.5
|
||
```bash | ||
Shell(192.168.100.5) > grep -i method /etc/login.defs | ||
Shell(192.168.100.7) > grep -i method /etc/login.defs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jimcat8 :
- what is the correct IP that should appear here - 192.168.100.5 (original) OR 192.168.100.7 (new) ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
192.168.100.5
@neelchauhan @jimcat8 Because of the errors made in the IP addresses of the prompts, and because this PR now conflicts with a grammar PR pushed and merged yesterday (which did not deal with the technical aspects of this document), I'm going to have to elect to close this PR yet again. @neelchauhan If you see any wording changes that still need to be dealt with, without messing with the technical aspects of the document, I'm more than willing to merge those. Thanks to all. |
It seemed my previous PR #1854 got prematurely merged and subsequently reverted in #1863, so here is a revised version.
Author checklist (Completed by original Author)
Rocky Documentation checklist (Completed by Rocky team)