From 1c4bc090fc737662740260a6ad88709b87d1b83c Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Tue, 21 Apr 2020 12:38:15 +0200
Subject: Improve webpull

---
 nomad/jitsi.hcl      |  2 +-
 nomad/web_static.hcl | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'nomad')

diff --git a/nomad/jitsi.hcl b/nomad/jitsi.hcl
index 3cf3c7e..bcfab06 100644
--- a/nomad/jitsi.hcl
+++ b/nomad/jitsi.hcl
@@ -93,7 +93,7 @@ job "jitsi" {
     task "front" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_front:v3"
+        image = "superboum/amd64_jitsi_front:v4"
         network_mode = "host"
         port_map {
           https_port = 443
diff --git a/nomad/web_static.hcl b/nomad/web_static.hcl
index b3ad3e8..c935b2a 100644
--- a/nomad/web_static.hcl
+++ b/nomad/web_static.hcl
@@ -59,19 +59,27 @@ EOH
     }
   }
 
-  /* To be replaced by a static site manager */
   group "quentin" {
     task "server" {
       driver = "docker"
       config {
-        image = "superboum/amd64_blog:v19"
+        image = "superboum/amd64_webpull_ruby:v1"
         port_map {
-          web_port = 8043
+          web_port = 8080
         }
       }
 
+      template {
+        data = <<EOH
+WEBPULL_REPO="https://git.deuxfleurs.fr/quentin/quentin.dufour.io.git"
+WEBPULL_TOKEN="{{ key "secrets/web/quentin.dufour.io_token" | trimSpace }}"
+EOH
+        destination = "secrets/env"
+        env = true
+      }
+
       resources {
-        memory = 20
+        memory = 500
         network {
           port "web_port" {}
         }
-- 
cgit v1.2.3