From 05d7a87306a8fba02969fedcc07b84b8d12f365c Mon Sep 17 00:00:00 2001
From: Ben Martin <ben@brmartin.co.uk>
Date: Sat, 15 Jun 2024 15:59:43 +0100
Subject: [PATCH] Resolve configuration issues (#8)

Reviewed-on: https://git.brmartin.co.uk/ben/cluster-state/pulls/8
---
 .gitea/workflows/plan-and-apply.yaml |  2 --
 modules/media-centre/jobspec.json    | 13 ++++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/plan-and-apply.yaml b/.gitea/workflows/plan-and-apply.yaml
index 7e922b4..72b4a98 100644
--- a/.gitea/workflows/plan-and-apply.yaml
+++ b/.gitea/workflows/plan-and-apply.yaml
@@ -46,8 +46,6 @@ jobs:
         run: terraform plan -out=tfplan
         continue-on-error: true
       - uses: hashicorp/setup-nomad@main
-      - name: Install jq
-        run: sudo apt-get update && sudo apt-get install -y jq
       - name: Nomad Validate
         run: terraform show -json tfplan | jq -r '.planned_values.root_module.child_modules[].resources[].values.jobspec' | nomad job validate -json -
       - uses: actions/github-script@v7
diff --git a/modules/media-centre/jobspec.json b/modules/media-centre/jobspec.json
index 562108b..f12fca7 100644
--- a/modules/media-centre/jobspec.json
+++ b/modules/media-centre/jobspec.json
@@ -19,11 +19,14 @@
                 "target": "/media",
                 "volume_options": {
                   "driver_config": {
-                    "name": "nfs",
-                    "options": {
-                      "o": "addr=martinibar.lan,nolock,soft,rw",
-                      "device": ":/volume1/docker"
-                    }
+                    "name": "local",
+                    "options": [
+                      {
+                        "type": "nfs",
+                        "o": "addr=martinibar.lan,nolock,soft,rw",
+                        "device": ":/volume1/docker"
+                      }
+                    ]
                   }
                 }
               },