From b4bfbddd5416bde941ba9fa8d453c31ed27de1d3 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Tue, 16 Jun 2020 17:01:38 +0200 Subject: Some other fixes --- ansible/roles/consul/files/consul.service | 2 ++ ansible/roles/nomad/files/nomad.service | 4 +++- nomad/email.hcl | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ansible/roles/consul/files/consul.service b/ansible/roles/consul/files/consul.service index 3993567..ffaa2a3 100644 --- a/ansible/roles/consul/files/consul.service +++ b/ansible/roles/consul/files/consul.service @@ -1,5 +1,7 @@ [Unit] Description=Consul +After=network-online.target +Wants=network-online.target [Service] ExecStart=/usr/local/bin/consul agent -config-dir=/etc/consul diff --git a/ansible/roles/nomad/files/nomad.service b/ansible/roles/nomad/files/nomad.service index 34dc1fc..50116be 100644 --- a/ansible/roles/nomad/files/nomad.service +++ b/ansible/roles/nomad/files/nomad.service @@ -1,9 +1,11 @@ [Unit] Description=Nomad After=network-online.target -Wants=network-online.target After=glusterd.service +After=consul.service +Wants=network-online.target Wants=glusterd.service +Wants=consul.service [Service] ExecStart=/usr/local/bin/nomad agent -config /etc/nomad diff --git a/nomad/email.hcl b/nomad/email.hcl index 4b4be41..f085324 100644 --- a/nomad/email.hcl +++ b/nomad/email.hcl @@ -34,6 +34,7 @@ job "email" { cpu = 100 memory = 200 network { + mbits = 1 port "auth_port" { static = "1337" } @@ -179,6 +180,7 @@ job "email" { cpu = 100 memory = 50 network { + mbits = 1 port "dkim_port" { static = "8999" } @@ -261,6 +263,7 @@ job "email" { cpu = 100 memory = 50 network { + mbits = 1 port "smtp_port" { static = "25" } @@ -436,6 +439,7 @@ job "email" { cpu = 200 memory = 1000 network { + mbits = 1 port "sogo_web_port" {} } } -- cgit v1.2.3