From a2adaa2101d2b82d457c1ef6e9e25acb9022b9fc Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Tue, 22 Dec 2020 14:52:49 +0100
Subject: Migrate directory to new Nomad syntax

---
 app/deployment/bottin2.hcl   | 118 -------------------------------------------
 app/deployment/directory.hcl | 114 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 118 deletions(-)
 delete mode 100644 app/deployment/bottin2.hcl
 create mode 100644 app/deployment/directory.hcl

diff --git a/app/deployment/bottin2.hcl b/app/deployment/bottin2.hcl
deleted file mode 100644
index fec7d74..0000000
--- a/app/deployment/bottin2.hcl
+++ /dev/null
@@ -1,118 +0,0 @@
-job "directory2" {
-  datacenters = ["dc1"]
-  type = "service"
-  priority = 90
-
-  constraint {
-    attribute = "${attr.cpu.arch}"
-    value     = "amd64"
-  }
-
-  group "bottin" {
-    count = 1
-    task "bottin" {
-      driver = "docker"
-      config {
-        image = "lxpz/bottin_amd64:20"
-        network_mode = "host"
-        readonly_rootfs = true
-        port_map {
-          ldap_port = 389
-        }
-        volumes = [
-          "secrets/config.json:/config.json"
-        ]
-      }
-
-      resources {
-        memory = 100
-        network {
-          port "ldap_port" {
-            static = "389"
-          }
-        }
-      }
-
-      template {
-        data = "{{ key \"configuration/directory/bottin/config.json\" }}"
-        destination = "secrets/config.json"
-      }
-
-      service {
-        tags = ["bottin"]
-        port = "ldap_port"
-        address_mode = "host"
-        name = "bottin2"
-        check {
-          type = "tcp"
-          port = "ldap_port"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-      }
-    }
-  }
-
-  group "guichet" {
-    count = 1
-    task "guichet" {
-      driver = "docker"
-      config {
-        image = "lxpz/guichet_amd64:10"
-        readonly_rootfs = true
-        port_map {
-          web_port = 9991
-        }
-        volumes = [
-          "secrets/config.json:/config.json"
-        ]
-      }
-
-      artifact {
-        source = "http://127.0.0.1:8500/v1/kv/configuration/directory/guichet/config.json.tpl?raw"
-        destination = "secrets/config.json.tpl"
-        mode = "file"
-      }
-      template {
-        source = "secrets/config.json.tpl"
-        destination = "secrets/config.json"
-      }
-
-      resources {
-        memory = 200
-        network {
-          port "web_port" {}
-        }
-      }
-
-      service {
-        name = "guichet"
-        tags = [
-          "guichet",
-          "traefik.enable=true",
-          "traefik.frontend.entryPoints=https,http",
-          "traefik.frontend.rule=Host:guichet.deuxfleurs.fr",
-        ]
-        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/app/deployment/directory.hcl b/app/deployment/directory.hcl
new file mode 100644
index 0000000..0acc08f
--- /dev/null
+++ b/app/deployment/directory.hcl
@@ -0,0 +1,114 @@
+job "directory" {
+  datacenters = ["dc1"]
+  type = "service"
+  priority = 90
+
+  constraint {
+    attribute = "${attr.cpu.arch}"
+    value     = "amd64"
+  }
+
+  group "bottin" {
+    count = 1
+
+    network {
+      port "ldap_port" {
+        static = 389
+        to = 389
+      }
+    }
+
+    task "bottin" {
+      driver = "docker"
+      config {
+        image = "lxpz/bottin_amd64:20"
+        network_mode = "host"
+        readonly_rootfs = true
+        ports = [ "ldap_port" ]
+        volumes = [
+          "secrets/config.json:/config.json"
+        ]
+      }
+
+      resources {
+        memory = 100
+      }
+
+      template {
+        data = file("../config/configuration/directory/bottin/config.json")
+        destination = "secrets/config.json"
+      }
+
+      service {
+        tags = ["bottin"]
+        port = "ldap_port"
+        address_mode = "host"
+        name = "bottin2"
+        check {
+          type = "tcp"
+          port = "ldap_port"
+          interval = "60s"
+          timeout = "5s"
+          check_restart {
+            limit = 3
+            grace = "90s"
+            ignore_warnings = false
+          }
+        }
+      }
+    }
+  }
+
+  group "guichet" {
+    count = 1
+
+    network {
+      port "web_port" { to = 9991 }
+    }
+
+    task "guichet" {
+      driver = "docker"
+      config {
+        image = "lxpz/guichet_amd64:10"
+        readonly_rootfs = true
+        ports = [ "web_port" ]
+        volumes = [
+          "secrets/config.json:/config.json"
+        ]
+      }
+
+      template {
+        data = file("../config/configuration/directory/guichet/config.json.tpl")
+        destination = "secrets/config.json"
+      }
+
+      resources {
+        memory = 200
+      }
+
+      service {
+        name = "guichet"
+        tags = [
+          "guichet",
+          "traefik.enable=true",
+          "traefik.frontend.entryPoints=https,http",
+          "traefik.frontend.rule=Host:guichet.deuxfleurs.fr",
+        ]
+        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
+          }
+        }
+      }
+    }
+  }
+}
+
-- 
cgit v1.2.3