From a2f8e11d06f5232e1100fe278fc579c80f9970d0 Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Mon, 28 Dec 2020 10:49:09 +0100
Subject: [PATCH] Migrate plume+diagnet+web_static

---
 app/deployment/plume.hcl      |  4 +++-
 app/deployment/science.hcl    | 11 +++++------
 app/deployment/web_static.hcl | 30 ++++++++++++++----------------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/deployment/plume.hcl b/app/deployment/plume.hcl
index 9010570..59ec28a 100644
--- a/app/deployment/plume.hcl
+++ b/app/deployment/plume.hcl
@@ -50,8 +50,10 @@ job "plume" {
         port = "web_port"
         address_mode = "host"
         check {
-          type = "tcp"
+          type = "http"
+          protocol = "http"
           port = "web_port"
+          path = "/"
           interval = "60s"
           timeout = "5s"
           check_restart {
diff --git a/app/deployment/science.hcl b/app/deployment/science.hcl
index 8b13e3f..1aee7a8 100644
--- a/app/deployment/science.hcl
+++ b/app/deployment/science.hcl
@@ -9,6 +9,10 @@ job "science" {
   }
 
   group "diagnet" {
+    network {
+      port "web_port" { to = 8000 }
+    }
+
     task "main" {
       driver = "docker"
       config {
@@ -18,17 +22,12 @@ job "science" {
           "-chrome", "-chrome-interval", "60m",
           "-http", ":8000"
         ]
-        port_map {
-          web_port = 8000
-        }
+        ports = [ "web_port" ]
       }
 
       resources {
         cpu = 1000
         memory = 1200
-        network {
-          port "web_port" {}
-        }
       }
 
       service {
diff --git a/app/deployment/web_static.hcl b/app/deployment/web_static.hcl
index c935b2a..51de395 100644
--- a/app/deployment/web_static.hcl
+++ b/app/deployment/web_static.hcl
@@ -8,13 +8,15 @@ job "web_static" {
   }
 
   group "landing" {
+    network {
+      port "deuxfleurs_port" { to = 8080 }
+    }
+
     task "server" {
       driver = "docker"
       config {
         image = "superboum/amd64_webpull_pug:v4"
-        port_map {
-          web_port = 8080
-        }
+        ports = [ "deuxfleurs_port" ]
       }
 
       template {
@@ -28,9 +30,6 @@ EOH
 
       resources {
         memory = 200
-        network {
-          port "web_port" {}
-        }
       }
 
       service {
@@ -41,12 +40,12 @@ EOH
           "traefik.frontend.rule=Host:deuxfleurs.fr,www.deuxfleurs.fr,deuxfleurs.org,www.deuxfleurs.org;PathPrefix:/",
           "traefik.frontend.priority=10"
         ]
-        port = "web_port"
+        port = "deuxfleurs_port"
         address_mode = "host"
         name = "landing"
         check {
           type = "tcp"
-          port = "web_port"
+          port = "deuxfleurs_port"
           interval = "60s"
           timeout = "5s"
           check_restart {
@@ -60,13 +59,15 @@ EOH
   }
 
   group "quentin" {
+    network {
+      port "quentin_port" { to = 8080 }
+    }
+
     task "server" {
       driver = "docker"
       config {
         image = "superboum/amd64_webpull_ruby:v1"
-        port_map {
-          web_port = 8080
-        }
+        ports = [ "quentin_port" ]
       }
 
       template {
@@ -80,9 +81,6 @@ EOH
 
       resources {
         memory = 500
-        network {
-          port "web_port" {}
-        }
       }
 
       service {
@@ -92,12 +90,12 @@ EOH
           "traefik.frontend.entryPoints=https",
           "traefik.frontend.rule=Host:quentin.dufour.io,www.quentin.dufour.io;PathPrefix:/"
         ]
-        port = "web_port"
+        port = "quentin_port"
         address_mode = "host"
         name = "blog-quentin"
         check {
           type = "tcp"
-          port = "web_port"
+          port = "quentin_port"
           interval = "60s"
           timeout = "5s"
           check_restart {