From 8d2c6dfb68bc1152a75e565df598e231f9f47202 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Fri, 21 Aug 2020 16:02:56 +0100
Subject: [PATCH] Move gitea to ZFS

---
 .../intersect-docker/files/gitea/docker-compose.yml   |  8 ++++----
 ansible/roles/intersect-docker/tasks/gitea.yml        | 11 ++---------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/ansible/roles/intersect-docker/files/gitea/docker-compose.yml b/ansible/roles/intersect-docker/files/gitea/docker-compose.yml
index 588e5d0..f607df0 100644
--- a/ansible/roles/intersect-docker/files/gitea/docker-compose.yml
+++ b/ansible/roles/intersect-docker/files/gitea/docker-compose.yml
@@ -17,8 +17,8 @@ services:
     depends_on:
       - db
     volumes:
-      - ./gitea:/data
-      - ./repos:/data/git
+      - /mnt/tank/app-data/gitea:/data
+      - /mnt/tank/files/repositories:/data/git
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
 
@@ -26,7 +26,7 @@ services:
     image: postgres:12-alpine
     restart: unless-stopped
     volumes:
-      - ./postgres:/var/lib/postgresql/data
+      - /mnt/tank/dbs/postgres/gitea:/var/lib/postgresql/data
     environment:
       - POSTGRES_PASSWORD=gitea
       - POSTGRES_USER=gitea
@@ -50,7 +50,7 @@ services:
     image: theorangeone/git-mirror:latest
     restart: unless-stopped
     volumes:
-      - ./repositories.toml:/app/repositories.toml:ro
+      - /mnt/tank/app-data/git-mirror/repositories.toml:/app/repositories.toml:ro
       - /scratch/git-mirror:/app/repos
     environment:
       - GITHUB_TOKEN={{ gitea.git_mirror_github_token }}
diff --git a/ansible/roles/intersect-docker/tasks/gitea.yml b/ansible/roles/intersect-docker/tasks/gitea.yml
index fa81983..f16f25f 100644
--- a/ansible/roles/intersect-docker/tasks/gitea.yml
+++ b/ansible/roles/intersect-docker/tasks/gitea.yml
@@ -9,13 +9,6 @@
     mode: "{{ docker_compose_directory_mask }}"
   become: true
 
-- name: Create gitea config directory
-  file:
-    path: /opt/gitea/gitea/gitea/conf
-    state: directory
-    mode: "{{ docker_compose_directory_mask }}"
-  become: true
-
 - name: Install gitea compose file
   template:
     src: files/gitea/docker-compose.yml
@@ -29,7 +22,7 @@
 - name: Install gitea config file
   template:
     src: files/gitea/app.ini
-    dest: /opt/gitea/gitea/gitea/conf/app.ini
+    dest: /mnt/tank/app-data/gitea/gitea/conf/app.ini
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
   register: gitea_config_file
@@ -38,7 +31,7 @@
 - name: Install git-mirror config file
   template:
     src: files/gitea/git-mirror-repositories.toml
-    dest: /opt/gitea/repositories.toml
+    dest: /mnt/tank/app-data/git-mirror/repositories.toml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
   register: git_mirror_config_file