From 5b23006e97ebe3b93e17a85ad1ec715361d427c6 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Sun, 14 Jan 2024 09:32:02 +0100
Subject: [PATCH] feat: move last application data folder in nomad share

---
 ansible/group_vars/cluster/mount | 24 ------------------------
 nomad-job/gitea.nomad            |  5 ++---
 nomad-job/pacoloco.nomad         |  2 +-
 nomad-job/radicale.nomad         |  2 +-
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/ansible/group_vars/cluster/mount b/ansible/group_vars/cluster/mount
index 66d70b7..fd7853f 100644
--- a/ansible/group_vars/cluster/mount
+++ b/ansible/group_vars/cluster/mount
@@ -1,20 +1,4 @@
 systemd_mounts:
-    diskstation_git:
-        share: "{{ nas_ip }}:{{ env_default_nfs_path }}/git"
-        mount: /mnt/diskstation/git
-        type: nfs
-        options:
-            - " "
-        automount: "{{ env_automount }}"
-        enabled: true
-    diskstation_CardDav:
-        share: "{{ nas_ip }}:{{ env_default_nfs_path }}/CardDav"
-        mount: /mnt/diskstation/CardDav
-        type: nfs
-        options:
-            - " "
-        automount: "{{ env_automount }}"
-        enabled: true
     backup_disk:
         share: /dev/sdb1
         mount: /mnt/backup
@@ -63,14 +47,6 @@ systemd_mounts:
             - " "
         automount: "{{ env_automount }}"
         enabled: true
-    diskstation_archMirror:
-        share: "{{ nas_ip }}:{{ env_default_nfs_path }}/archMirror"
-        mount: /mnt/diskstation/archMirror
-        type: nfs
-        options:
-            - " "
-        automount: "{{ env_automount }}"
-        enabled: true
     diskstation_nomad:
         share: "{{ nas_ip }}:{{ env_default_nfs_path }}/nomad"
         mount: /mnt/diskstation/nomad
diff --git a/nomad-job/gitea.nomad b/nomad-job/gitea.nomad
index 23694be..a706da4 100644
--- a/nomad-job/gitea.nomad
+++ b/nomad-job/gitea.nomad
@@ -60,7 +60,6 @@ job "git" {
           "ssh"
         ]
         volumes = [
-          "/mnt/diskstation/git:/repo",
           "/mnt/diskstation/nomad/gitea:/data"
         ]
       }
@@ -78,9 +77,9 @@ job "git" {
         GITEA__database__NAME                = "gitea"
         GITEA__database__USER                = "gitea"
         GITEA__service__DISABLE_REGISTRATION = "true"
-        GITEA__repository__ROOT              = "/repo"
+        GITEA__repository__ROOT              = "/data/gitea-repositories"
         GITEA__server__APP_DATA_PATH         = "/data"
-        GITEA__server__LFS_CONTENT_PATH      = "/repo/LFS"
+        GITEA__server__LFS_CONTENT_PATH      = "/data/lfs"
         GITEA__webhook__ALLOWED_HOST_LIST    = "drone.ducamps.eu"
         GITEA__webhook__DELIVER_TIMEOUT       = "30" 
       }
diff --git a/nomad-job/pacoloco.nomad b/nomad-job/pacoloco.nomad
index 6b55a60..0b26e13 100644
--- a/nomad-job/pacoloco.nomad
+++ b/nomad-job/pacoloco.nomad
@@ -31,7 +31,7 @@ job "pacoloco" {
         image = "ducampsv/pacoloco"
         ports = ["http"]
         volumes = [
-          "/mnt/diskstation/archMirror:/var/cache/pacoloco",
+          "/mnt/diskstation/nomad/pacoloco:/var/cache/pacoloco",
           "local/pacoloco.yaml:/etc/pacoloco.yaml"
         ]
 
diff --git a/nomad-job/radicale.nomad b/nomad-job/radicale.nomad
index 308d8b4..f5422de 100644
--- a/nomad-job/radicale.nomad
+++ b/nomad-job/radicale.nomad
@@ -43,7 +43,7 @@ job "radicale" {
         ports = ["http"]
         volumes = [
           "local/config:/config/config",
-          "/mnt/diskstation/CardDav:/data"
+          "/mnt/diskstation/nomad/radicale:/data"
         ]
 
       }