From f746f93fcce0d6013ad5f8dd71bb040136098038 Mon Sep 17 00:00:00 2001
From: Blallo <blallo@autistici.org>
Date: Tue, 23 Feb 2021 18:43:27 +0100
Subject: [PATCH] Remove unused volumes and change volumes base path

---
 tasks/custom_volumes.yml | 26 ++++----------------------
 tasks/drone-agent.yml    |  4 ++--
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/tasks/custom_volumes.yml b/tasks/custom_volumes.yml
index d0cad1b..850c9df 100644
--- a/tasks/custom_volumes.yml
+++ b/tasks/custom_volumes.yml
@@ -1,34 +1,16 @@
 ---
-- name: create drone exchange directory
+- name: ensure drone exchange path exists
   file:
-    path: /var/drone
+    path: /store/drone
     state: directory
     owner: root
     group: root
     mode: 0755
   register: drone_agent_config
 
-- name: create exchange path for build artifacts
+- name: ensure exchange path for build artifacts exists
   file:
-    path: /var/builds
-    state: directory
-    owner: root
-    group: www-data
-    mode: 0775
-  register: drone_agent_config
-
-- name: create exchange path for signal build artifacts
-  file:
-    path: /var/builds/signal
-    state: directory
-    owner: root
-    group: www-data
-    mode: 0775
-  register: drone_agent_config
-
-- name: create exchange path for fenix build artifacts
-  file:
-    path: /var/builds/fenix
+    path: /store/builds
     state: directory
     owner: root
     group: www-data
diff --git a/tasks/drone-agent.yml b/tasks/drone-agent.yml
index e7973b6..38ace2e 100644
--- a/tasks/drone-agent.yml
+++ b/tasks/drone-agent.yml
@@ -24,8 +24,8 @@
     restart_policy: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /var/drone:/var/drone
-      - /var/builds:/var/builds
+      - /store/drone:/var/drone
+      - /store/builds:/var/builds
     env_file: /etc/drone/drone-agent.env
   when: drone_agent_config is defined and drone_agent_config.changed
   tags: