aboutsummaryrefslogtreecommitdiff
path: root/nomad
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2020-02-11 22:21:40 +0100
committerQuentin <quentin@deuxfleurs.fr>2020-02-11 22:21:40 +0100
commite700d146f032a824f1735ab31a28e2ac0f374629 (patch)
tree8208e1d6dc421afa3646b19641d7215471593046 /nomad
parent3feb426e9f2a1ed790eb3932d81cb959bafc91d5 (diff)
parent44a341f9a69e8d6ca2b9f4e4f8574d8d89668119 (diff)
downloadinfrastructure-e700d146f032a824f1735ab31a28e2ac0f374629.tar.gz
infrastructure-e700d146f032a824f1735ab31a28e2ac0f374629.zip
Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr
Diffstat (limited to 'nomad')
-rw-r--r--nomad/bottin2.hcl60
-rw-r--r--nomad/email.hcl4
2 files changed, 58 insertions, 6 deletions
diff --git a/nomad/bottin2.hcl b/nomad/bottin2.hcl
index 8c02078..da315de 100644
--- a/nomad/bottin2.hcl
+++ b/nomad/bottin2.hcl
@@ -7,12 +7,12 @@ job "directory2" {
value = "amd64"
}
- group "ldap" {
+ group "bottin" {
count = 1
- task "server" {
+ task "bottin" {
driver = "docker"
config {
- image = "lxpz/bottin_amd64:1"
+ image = "lxpz/bottin_amd64:8"
readonly_rootfs = true
port_map {
ldap_port = 1389
@@ -32,7 +32,7 @@ job "directory2" {
}
template {
- data = "{{ key \"configuration/bottin/config.json\" }}"
+ data = "{{ key \"configuration/directory/bottin/config.json\" }}"
destination = "secrets/config.json"
}
@@ -55,5 +55,57 @@ job "directory2" {
}
}
}
+
+ group "guichet" {
+ count = 1
+ task "guichet" {
+ driver = "docker"
+ config {
+ image = "lxpz/guichet_amd64:2"
+ readonly_rootfs = true
+ port_map {
+ web_port = 9991
+ }
+ volumes = [
+ "secrets/config.json:/config.json"
+ ]
+ }
+
+ template {
+ data = "{{ key \"configuration/directory/guichet/config.json\" }}"
+ destination = "secrets/config.json"
+ }
+
+ resources {
+ memory = 100
+ network {
+ port "web_port" {}
+ }
+ }
+
+ service {
+ name = "guichet"
+ tags = [
+ "guichet",
+ "traefik.enable=true",
+ "traefik.frontend.entryPoints=https,http",
+ "traefik.frontend.rule=Host:guichet.deuxfleurs.fr,guichet.deuxfleurs.org",
+ ]
+ port = "web_port"
+ address_mode = "host"
+ check {
+ type = "tcp"
+ port = "web_port"
+ interval = "60s"
+ timeout = "5s"
+ check_restart {
+ limit = 3
+ grace = "90s"
+ ignore_warnings = false
+ }
+ }
+ }
+ }
+ }
}
diff --git a/nomad/email.hcl b/nomad/email.hcl
index 17ae613..1d5c8c1 100644
--- a/nomad/email.hcl
+++ b/nomad/email.hcl
@@ -416,8 +416,8 @@ job "email" {
tags = [
"sogo",
"traefik.enable=true",
- "traefik.frontend.entryPoints=https",
- "traefik.frontend.rule=Host:sogo.deuxfleurs.fr;PathPrefix:/"
+ "traefik.frontend.entryPoints=https,http",
+ "traefik.frontend.rule=Host:www.sogo.deuxfleurs.fr,sogo.deuxfleurs.fr;PathPrefix:/"
]
check {
type = "tcp"