From a6c4828cb66eb74ef2320f9fa06b59ae299e5c5f Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 30 Dec 2021 13:27:39 +0100
Subject: Add systemd service to mount garage

---
 app/bad.csi-s3/deploy/csi-s3.hcl | 39 +++++++++++++++++++++++++++++++++++++++
 app/csi-s3/deploy/csi-s3.hcl     | 39 ---------------------------------------
 app/im/deploy/im.hcl             |  4 ++--
 3 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 app/bad.csi-s3/deploy/csi-s3.hcl
 delete mode 100644 app/csi-s3/deploy/csi-s3.hcl

(limited to 'app')

diff --git a/app/bad.csi-s3/deploy/csi-s3.hcl b/app/bad.csi-s3/deploy/csi-s3.hcl
new file mode 100644
index 0000000..8e70c6a
--- /dev/null
+++ b/app/bad.csi-s3/deploy/csi-s3.hcl
@@ -0,0 +1,39 @@
+job "plugin-csi-s3-nodes" {
+  datacenters = ["neptune", "pluton"]
+
+  # you can run node plugins as service jobs as well, but this ensures
+  # that all nodes in the DC have a copy.
+  type = "system"
+
+  group "nodes" {
+    task "plugin" {
+      driver = "docker"
+
+      config {
+        image = "ctrox/csi-s3:v1.2.0-rc.1"
+
+        args = [
+          "--endpoint=unix://csi/csi.sock",
+          "--nodeid=${node.unique.id}",
+          "--logtostderr",
+          "--v=5",
+        ]
+
+        # node plugins must run as privileged jobs because they
+        # mount disks to the host
+        privileged = true
+      }
+
+      csi_plugin {
+        id        = "csi-s3"
+        type      = "node"
+        mount_dir = "/csi"
+      }
+
+      resources {
+        cpu    = 500
+        memory = 256
+      }
+    }
+  }
+}
diff --git a/app/csi-s3/deploy/csi-s3.hcl b/app/csi-s3/deploy/csi-s3.hcl
deleted file mode 100644
index 8e70c6a..0000000
--- a/app/csi-s3/deploy/csi-s3.hcl
+++ /dev/null
@@ -1,39 +0,0 @@
-job "plugin-csi-s3-nodes" {
-  datacenters = ["neptune", "pluton"]
-
-  # you can run node plugins as service jobs as well, but this ensures
-  # that all nodes in the DC have a copy.
-  type = "system"
-
-  group "nodes" {
-    task "plugin" {
-      driver = "docker"
-
-      config {
-        image = "ctrox/csi-s3:v1.2.0-rc.1"
-
-        args = [
-          "--endpoint=unix://csi/csi.sock",
-          "--nodeid=${node.unique.id}",
-          "--logtostderr",
-          "--v=5",
-        ]
-
-        # node plugins must run as privileged jobs because they
-        # mount disks to the host
-        privileged = true
-      }
-
-      csi_plugin {
-        id        = "csi-s3"
-        type      = "node"
-        mount_dir = "/csi"
-      }
-
-      resources {
-        cpu    = 500
-        memory = 256
-      }
-    }
-  }
-}
diff --git a/app/im/deploy/im.hcl b/app/im/deploy/im.hcl
index 734669a..3cf4e95 100644
--- a/app/im/deploy/im.hcl
+++ b/app/im/deploy/im.hcl
@@ -29,7 +29,7 @@ job "im" {
 
       driver = "docker"
       config {
-        image = "litestream/litestream"
+        image = "litestream/litestream:0.3.7"
         args = [
 		      "restore", "-config", "/etc/litestream.yml", "/ephemeral/homeserver.db"
         ]
@@ -109,7 +109,7 @@ job "im" {
     task "replicate-db" {
       driver = "docker"
       config {
-        image = "litestream/litestream"
+        image = "litestream/litestream:0.3.7"
         args = [
 		      "replicate", "-config", "/etc/litestream.yml"
         ]
-- 
cgit v1.2.3