aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradrien <adrien@luxeylab.net>2023-03-17 08:53:27 +0000
committeradrien <adrien@luxeylab.net>2023-03-17 08:53:27 +0000
commitfd4f601ee09178d386d207b901c1fbbc6033a229 (patch)
tree6bd95c7cff80ff7efbb5730983f738a69326bcf5
parent551988c8082c0a6f8525cb3a850326f3e9ad8318 (diff)
parentfe2eda17024031dd93e8892a00c2f99e47ab8eec (diff)
downloadnixcfg-fd4f601ee09178d386d207b901c1fbbc6033a229.tar.gz
nixcfg-fd4f601ee09178d386d207b901c1fbbc6033a229.zip
Merge pull request 'configuration for imap.deuxfleurs.fr & smtp.deuxfleurs.fr as part of email service for d53 + convert tabs into spaces (couldn't help myself)' (#8) from feat/d53-email into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/pulls/8
-rw-r--r--cluster/prod/app/email/deploy/email.hcl22
1 files changed, 12 insertions, 10 deletions
diff --git a/cluster/prod/app/email/deploy/email.hcl b/cluster/prod/app/email/deploy/email.hcl
index 7dbeaf6..35e4213 100644
--- a/cluster/prod/app/email/deploy/email.hcl
+++ b/cluster/prod/app/email/deploy/email.hcl
@@ -63,6 +63,7 @@ job "email" {
port = "imap_port"
tags = [
"dovecot"
+ "d53-a imap.deuxfleurs.fr",
]
check {
type = "tcp"
@@ -281,9 +282,10 @@ job "email" {
tags = [
"postfix",
"(diplonat (tcp_port 25 465 587))",
- "d53-a email-in.deuxfleurs.fr",
- # ipv6 is commented for now as port is not open in firewall (TODO)
- # "d53-aaaa email-in.deuxfleurs.fr"
+ "d53-a email-in.deuxfleurs.fr",
+ "d53-a smtp.deuxfleurs.fr",
+ # ipv6 is commented for now as port is not open in firewall (TODO)
+ # "d53-aaaa email-in.deuxfleurs.fr"
]
check {
type = "tcp"
@@ -409,12 +411,12 @@ job "email" {
readonly_rootfs = true
ports = [ "alps_web_port" ]
args = [
- "-skiptlsverification",
- "-theme",
- "alps",
- "imaps://imap.deuxfleurs.fr:993",
- "smtps://smtp.deuxfleurs.fr:465"
- ]
+ "-skiptlsverification",
+ "-theme",
+ "alps",
+ "imaps://imap.deuxfleurs.fr:993",
+ "smtps://smtp.deuxfleurs.fr:465"
+ ]
}
resources {
@@ -463,7 +465,7 @@ job "email" {
readonly_rootfs = false
ports = [ "sogo_web_port" ]
volumes = [
- "secrets/sogo.conf:/etc/sogo/sogo.conf",
+ "secrets/sogo.conf:/etc/sogo/sogo.conf",
]
}