M-Labs/it-infra
M-Labs/it-infra
8
0
Fork 6
Code Issues 11 Pull Requests 1 Releases Wiki Activity

Add m-labs-intl.com domain to mailserver and hooks subdomain #39

Closed
esavkin wants to merge 2 commits from 134-intl-com into master
pull from: 134-intl-com
merge into: M-Labs:master
Conversation 3 Commits 2 Files Changed 2 +12 -1
esavkin commented 2024-06-07 14:04:39 +08:00
Owner
Copy Link

Also needs setting up aliases or new accounts on new domain.

Also needs setting up aliases or new accounts on new domain.
sb10q commented 2024-06-08 11:40:10 +08:00
Owner
Copy Link

How many times did I tell you that PRs need to be separated by topic?
Obviously, configuration of the VPS does NOT belong in a PR titled "Add m-labs-intl.com domain to mailserver".

I'm growing tired of your lazy/careless approach.

How many times did I tell you that PRs need to be separated by topic? Obviously, configuration of the VPS does NOT belong in a PR titled "Add m-labs-intl.com domain to mailserver". I'm growing tired of your lazy/careless approach.
sb10q reviewed 2024-06-08 11:44:17 +08:00
m-labs-intl/redeploy.sh Outdated
@ -0,0 +4,4 @@
git fetch origin
git reset --hard origin/master
DOMAINNAME=m-labs-intl.com ./zola build -o /var/www/m-labs-intl.com/html/ --force
sb10q commented 2024-06-08 11:44:17 +08:00
Owner
Copy Link

The plan is to build the website on Hydra and upload it from there. It's briefly mentioned in the original issue (M-Labs/web2019#134) and I reminded you of it at least twice and explained it at length. Are you paying attention?

The plan is to build the website on Hydra and upload it from there. It's briefly mentioned in the original issue (https://git.m-labs.hk/M-Labs/web2019/issues/134) and I reminded you of it at least twice and explained it at length. Are you paying attention?
sb10q reviewed 2024-06-08 11:44:33 +08:00
sb10q reviewed 2024-06-08 11:46:37 +08:00
m-labs-intl/setup.sh Outdated
@ -0,0 +30,4 @@
cd /home/zolaupd;
git clone https://git.m-labs.hk/M-Labs/web2019.git;
cd web2019;
wget https://github.com/getzola/zola/releases/download/v0.18.0/zola-v0.18.0-x86_64-unknown-linux-gnu.tar.gz;
sb10q commented 2024-06-08 11:46:37 +08:00
Owner
Copy Link

None of this unmaintainable and undebuggable mess is necessary if you paid attention to what I kept repeating.

None of this unmaintainable and undebuggable mess is necessary if you paid attention to what I kept repeating.
sb10q commented 2024-06-14 19:15:17 +08:00
Owner
Copy Link

Those are very restrictive permissions for content that goes into a public repos.

Those are very restrictive permissions for content that goes into a public repos.
sb10q reviewed 2024-06-08 11:49:14 +08:00
m-labs-intl/setup.sh Outdated
@ -0,0 +49,4 @@
cp zolaupd /etc/cron.d/
systemctl enable cron
service cron reload
sb10q commented 2024-06-08 11:49:13 +08:00
Owner
Copy Link

Is that for certbot or for your crappy code? If it's the latter then remove.

Is that for certbot or for your crappy code? If it's the latter then remove.
sb10q marked this conversation as resolved
sb10q reviewed 2024-06-08 11:49:44 +08:00
m-labs-intl/setup.sh Outdated
@ -0,0 +3,4 @@
apt install git nginx-full python3 python3.12-venv python3-pip
snap install --classic certbot
sb10q commented 2024-06-08 11:49:44 +08:00
Owner
Copy Link

And this isn't installed with apt because?

And this isn't installed with apt because?
esavkin commented 2024-06-11 10:38:58 +08:00
Author
Owner
Copy Link

Because it is not recommended by certbot devs, especially for LTS systems: https://certbot.eff.org/instructions?ws=nginx&os=ubuntufocal.

Because it is not recommended by certbot devs, especially for LTS systems: https://certbot.eff.org/instructions?ws=nginx&os=ubuntufocal.
sb10q commented 2024-06-11 11:56:14 +08:00
Owner
Copy Link

Yet another problem and hack that would not exist if you had used the systems I had recommended.

Yet another problem and hack that would not exist if you had used the systems I had recommended.
👎 1
sb10q reviewed 2024-06-08 11:50:37 +08:00
m-labs-intl/setup.sh Outdated
@ -0,0 +57,4 @@
service nginx restart
certbot --nginx
sb10q commented 2024-06-08 11:50:37 +08:00
Owner
Copy Link

How is certificate auto-renewal handled?

How is certificate auto-renewal handled?
esavkin commented 2024-06-11 10:40:19 +08:00
Author
Owner
Copy Link

It automatically creates a cron job, that tests if certificate is about to expire time to time, and then updates if needed.

It automatically creates a cron job, that tests if certificate is about to expire time to time, and then updates if needed.
sb10q commented 2024-06-11 11:57:36 +08:00
Owner
Copy Link

Cron job or systemd timers?
Why would we need both cron and systemd?

Cron job or systemd timers? Why would we need both cron and systemd?
esavkin commented 2024-06-11 11:59:52 +08:00
Author
Owner
Copy Link

Cron job. The systemd is used for starting the rfq server.

Cron job. The systemd is used for starting the rfq server.
sb10q commented 2024-06-11 12:15:26 +08:00
Owner
Copy Link

You did not answer the second question.

You did not answer the second question.
esavkin force-pushed 134-intl-com from f9a065ea27 to 28f07245c6 2024-06-13 15:02:52 +08:00 Compare
sb10q reviewed 2024-06-14 19:11:52 +08:00
m-labs-intl/nginx.conf Outdated
@ -0,0 +87,4 @@
server mail.m-labs.hk:993;
}
upstream pop3s_backend {
sb10q commented 2024-06-14 19:11:52 +08:00
Owner
Copy Link

What is this for? Do you know how email works?

What is this for? Do you know how email works?
sb10q reviewed 2024-06-14 19:16:13 +08:00
nixbld-etc-nixos/configuration.nix Outdated
@ -1155,3 +1155,3 @@
localDnsResolver = false; # conflicts with dnsmasq
fqdn = "mail.m-labs.hk";
domains = [ "m-labs.hk" "m-labs.ph" "193thz.com" "malloctech.fr" ];
domains = [ "m-labs.hk" "m-labs.ph" "193thz.com" "malloctech.fr" "m-labs-intl.com" ];
sb10q commented 2024-06-14 19:16:13 +08:00
Owner
Copy Link

When will you clean up that PR?

When will you clean up that PR?
sb10q reviewed 2024-06-14 19:16:31 +08:00
m-labs-intl/setup.sh Outdated
@ -0,0 +13,4 @@
mkdir -p /var/www/m-labs-intl.com/html
chown -R zolaupd /var/www/m-labs-intl.com/
cp redeploy.sh /home/zolaupd/
sb10q commented 2024-06-14 19:16:31 +08:00
Owner
Copy Link

Where is that file from?

Where is that file from?
sb10q commented 2024-06-19 15:18:29 +08:00
Owner
Copy Link

Why do you keep ignoring my requests to break down PRs by function?

Why do you keep ignoring my requests to break down PRs by function?
esavkin force-pushed 134-intl-com from 2a4830ec55 to e5e02c010e 2024-06-19 15:38:49 +08:00 Compare
esavkin force-pushed 134-intl-com from e5e02c010e to 04dc9074e9 2024-06-20 17:40:44 +08:00 Compare
esavkin changed title from Add m-labs-intl.com domain to mailserver to Add m-labs-intl.com domain to mailserver and hooks subdomain 2024-06-20 17:45:49 +08:00
esavkin force-pushed 134-intl-com from 04dc9074e9 to 79af7c9cbd 2024-07-08 11:47:37 +08:00 Compare
sb10q reviewed 2024-07-18 12:01:28 +08:00
nixbld-etc-nixos/named/m-labs-intl.com Outdated
@ -17,0 +18,4 @@
mail A 5.78.86.156
mail AAAA 2a01:4ff:1f0:83de::1
mail._domainkey TXT "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCl38A/Z0IInVU157qzrWgMfYm2iDHoWZsTyiiOoZdT7kHMzS/M2OMXMt7r5g1/7pCPClsGUDJvKGqVMmjJuPleMyKHwpGeT92qDNEFpt6ahneap/oYx5eBYM/vGcgmleNxyIoBHsptaZvqD4vCEFaC22f8UL5QAgQD3wCH3FwlpQIDAQAB"
sb10q commented 2024-07-18 12:01:28 +08:00
Owner
Copy Link

Where is the DKIM private key ?

Where is the DKIM private key ?
esavkin commented 2024-07-19 10:53:10 +08:00
Author
Owner
Copy Link

It's a copy from m-labs.hk, because the m-labs-intl is just a reverse proxy for email.

It's a copy from `m-labs.hk`, because the m-labs-intl is just a reverse proxy for email.
sb10q commented 2024-08-14 11:06:53 +08:00
Owner
Copy Link

https://nixos-mailserver.readthedocs.io/en/latest/setup-guide.html
There is one DKIM key per domain.

https://nixos-mailserver.readthedocs.io/en/latest/setup-guide.html There is one DKIM key per domain.
sb10q reviewed 2024-07-18 12:02:48 +08:00
nixbld-etc-nixos/named/m-labs-intl.com Outdated
@ -17,0 +19,4 @@
mail A 5.78.86.156
mail AAAA 2a01:4ff:1f0:83de::1
mail._domainkey TXT "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCl38A/Z0IInVU157qzrWgMfYm2iDHoWZsTyiiOoZdT7kHMzS/M2OMXMt7r5g1/7pCPClsGUDJvKGqVMmjJuPleMyKHwpGeT92qDNEFpt6ahneap/oYx5eBYM/vGcgmleNxyIoBHsptaZvqD4vCEFaC22f8UL5QAgQD3wCH3FwlpQIDAQAB"
_dmarc TXT "v=DMARC1; p=none"
sb10q commented 2024-07-18 12:02:48 +08:00
Owner
Copy Link

SPF?

SPF?
esavkin added 1 commit 2024-07-26 17:46:58 +08:00 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin force-pushed 134-intl-com from 320a7535a3 to 5a3be3e3b4 2024-07-29 11:44:48 +08:00 Compare
sb10q reviewed 2024-08-14 10:56:27 +08:00
nixbld-etc-nixos/named/m-labs-intl.com Outdated
@ -15,2 +15,4 @@
AAAA 2a01:4ff:1f0:83de::1
MX 10 mail.m-labs-intl.com.
TXT "v=spf1 mx a:router.alt.m-labs.hk a:mail.m-labs.hk -all"
sb10q commented 2024-08-14 10:56:25 +08:00
Owner
Copy Link

As I said before, we need to proxy the outgoing emails through the VPS as well. Our mailserver also gets blocked due to its being in Hong Kong. This is not consistent with this SPF entry.

As I said before, we need to proxy the outgoing emails through the VPS as well. Our mailserver also gets blocked due to its being in Hong Kong. This is not consistent with this SPF entry.
👍 1
sb10q commented 2024-08-14 10:57:21 +08:00
Owner
Copy Link

So just mx

So just ``mx``
esavkin force-pushed 134-intl-com from 5a3be3e3b4 to daf9a4d539 2024-08-14 10:59:27 +08:00 Compare
esavkin force-pushed 134-intl-com from daf9a4d539 to b601c12b7d 2024-08-14 11:20:47 +08:00 Compare
sb10q commented 2024-08-14 11:43:06 +08:00
Owner
Copy Link

Fixed and merged manually.

Fixed and merged manually.
sb10q closed this pull request 2024-08-14 11:43:07 +08:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/it-infra#39
No description provided.
Delete Branch "134-intl-com"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?