Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/infrastructure

2 files changed, 52 insertions, 0 deletions

diff --git a/app/deployment/email.hcl b/app/deployment/email.hcl
index 898cfbc..9c88852 100644
--- a/app/deployment/email.hcl
+++ b/app/deployment/email.hcl
@@ -407,6 +407,57 @@ job "email" {
     }
   }
 
+  group "alps" {
+    count = 1
+    task "main" {
+    
+      driver = "docker"
+
+      config {
+        image = "superboum/amd64_alps:v1"
+        readonly_rootfs = true
+        port_map {
+          alps_web_port = 1323
+        }
+        command = "-theme"
+        args = [ "alps", "imaps://imap.deuxfleurs.fr:993", "smtps://smtp.deuxfleurs.fr:465" ]
+      }
+      
+      resources {
+        cpu = 50
+        memory = 40
+        network {
+          mbits = 1
+          port "alps_web_port" {}
+        }
+      }
+      
+      service {
+        name = "alps"
+        port = "alps_web_port"
+        address_mode = "host"
+        tags = [
+          "alps",
+          "traefik.enable=true",
+          "traefik.frontend.entryPoints=https,http",
+          "traefik.frontend.rule=Host:alps.deuxfleurs.fr"
+        ]
+        check {
+          type = "tcp"
+          port = "alps_web_port"
+          interval = "60s"
+          timeout = "5s"
+          check_restart {
+            limit = 3
+            grace = "5m"
+            ignore_warnings = false
+          }
+        }
+      }
+    }
+  }
+
+
   group "sogo" {
     count = 1
     task "bundle" {
diff --git a/app/deployment/jitsi.hcl b/app/deployment/jitsi.hcl
index 93c87f7..3c8de3a 100644
--- a/app/deployment/jitsi.hcl
+++ b/app/deployment/jitsi.hcl
@@ -185,6 +185,7 @@ job "jitsi" {
       env {
         #JITSI_DEBUG = 1
         JITSI_VIDEO_TCP = 8080
+        VIDEOBRIDGE_MAX_MEMORY = "1450m"
       }
 
       artifact {