From 2117594fe39a43c82cba2f175f4e2423a2e178fd Mon Sep 17 00:00:00 2001
From: Denis Nutiu <denis.nutiu@gmail.com>
Date: Wed, 5 Feb 2025 21:37:28 +0200
Subject: [PATCH] change directory structure

---
 peertube-server/playbook.yaml                 | 22 ++++++++++++-------
 peertube-server/templates/backup/backup.sh.j2 |  4 ++--
 .../templates/services/peertube.container.j2  |  6 ++---
 .../templates/services/postgres.container.j2  |  2 +-
 peertube-server/variables.yaml                |  4 +++-
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/peertube-server/playbook.yaml b/peertube-server/playbook.yaml
index 491319d..7a9d31e 100644
--- a/peertube-server/playbook.yaml
+++ b/peertube-server/playbook.yaml
@@ -9,15 +9,27 @@
     # Create necessary directories.
     - name: "Create directories"
       block:
+        - name: Create PeerTube base directory
+          ansible.builtin.file:
+            path: "{{ base_directory }}"
+            state: directory
+            mode: "0755"
+          ignore_errors: true
         - name: Create PeerTube data directory
           ansible.builtin.file:
-            path: "{{ peertube.base_directory }}/data"
+            path: "{{ peertube.data_directory }}"
             state: directory
             mode: "0755"
           ignore_errors: true
         - name: Create PeerTube config directory
           ansible.builtin.file:
-            path: "{{ peertube.base_directory }}/config"
+            path: "{{ peertube.config_directory }}"
+            state: directory
+            mode: "0754"
+          ignore_errors: true
+        - name: Create PeerTube backups directory
+          ansible.builtin.file:
+            path: "{{ peertube.backups_directory }}"
             state: directory
             mode: "0754"
           ignore_errors: true
@@ -27,12 +39,6 @@
             state: directory
             mode: "0754"
           ignore_errors: true
-        - name: Create Backups directory
-          ansible.builtin.file:
-            path: "{{ peertube.backups_directory }}"
-            state: directory
-            mode: "0754"
-          ignore_errors: true
     # Ensure dependencies are installed
     - name: "Install dependencies"
       block:
diff --git a/peertube-server/templates/backup/backup.sh.j2 b/peertube-server/templates/backup/backup.sh.j2
index 210bec2..c94330a 100644
--- a/peertube-server/templates/backup/backup.sh.j2
+++ b/peertube-server/templates/backup/backup.sh.j2
@@ -1,8 +1,8 @@
 name=$(date '+%Y-%m-%d')
-cd {{ peertube.base_directory }}
+cd {{ peertube.config_directory }}/..
 tar -zcvf "$name.config.tar.gz" config
+cd {{ peertube.data_directory }}/..
 tar -zcvf "$name.data.tar.gz" data
-mkdir -p {{ peertube.backups_directory }}
 mv *.tar.gz {{ peertube.backups_directory }}
 cd {{ postgres.postgres_directory }}/..
 systemctl stop postgres.service
diff --git a/peertube-server/templates/services/peertube.container.j2 b/peertube-server/templates/services/peertube.container.j2
index 1fa3af2..b70cf3a 100644
--- a/peertube-server/templates/services/peertube.container.j2
+++ b/peertube-server/templates/services/peertube.container.j2
@@ -4,12 +4,12 @@ After=redis.service
 
 [Container]
 ContainerName=peertube
-EnvironmentFile={{ peertube.base_directory }}/{{ peertube.env_file }}
+EnvironmentFile={{ base_directory }}/{{ peertube.env_file }}
 Image={{ peertube.image_name}}
 PublishPort=1935:1935
 PublishPort=9000:9000
-Volume={{ peertube.base_directory }}/data:/data
-Volume={{ peertube.base_directory }}/config:/config
+Volume={{ peertube.data_directory }}/data:/data
+Volume={{ peertube.config_directory }}/config:/config
 SecurityLabelType=peertube.process
 Network=peertube.network
 
diff --git a/peertube-server/templates/services/postgres.container.j2 b/peertube-server/templates/services/postgres.container.j2
index 762ee70..f0095b3 100644
--- a/peertube-server/templates/services/postgres.container.j2
+++ b/peertube-server/templates/services/postgres.container.j2
@@ -5,7 +5,7 @@ After=redis.service
 [Container]
 ServiceName=postgres
 ContainerName=postgres
-EnvironmentFile={{ peertube.base_directory }}/{{ peertube.env_file }}
+EnvironmentFile={{ base_directory }}/{{ peertube.env_file }}
 Image={{ postgres.image_name }}
 Volume={{ postgres.postgres_directory }}:/var/lib/postgresql/data
 Network=peertube.network
diff --git a/peertube-server/variables.yaml b/peertube-server/variables.yaml
index 62f49b9..28cbfc4 100644
--- a/peertube-server/variables.yaml
+++ b/peertube-server/variables.yaml
@@ -1,8 +1,10 @@
+base_directory: "/peertube"
 peertube:
-  base_directory: "/peertube"
   env_file: "environment_file"
   backups_directory: "/peertube/backups"
   image_name: "docker.io/chocobozzz/peertube:v7.0.1-bookworm"
+  data_directory: "/peertube/data"
+  config_directory: "/peertube/config"
 postgres:
   postgres_directory: "/peertube/postgres"
   image_name: "docker.io/postgres:13-alpine"