From ad6b442ba2bfa7fa5563364e5e542784597653fd Mon Sep 17 00:00:00 2001
From: j <j@842.be>
Date: Wed, 17 Dec 2025 21:39:15 +1300
Subject: [PATCH] Update 8 files

---
 gitea-server/_volumes.sh               | 2 +-
 gitea-server/backup.sh                 | 2 +-
 gitea-server/config/.template_info.env | 3 ---
 gitea-server/config/service.env        | 3 +++
 gitea-server/destroy.sh                | 2 +-
 gitea-server/install.sh                | 4 ++--
 gitea-server/restore.sh                | 2 +-
 gitea-server/start.sh                  | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gitea-server/_volumes.sh b/gitea-server/_volumes.sh
index c7c586d..ddac30b 100755
--- a/gitea-server/_volumes.sh
+++ b/gitea-server/_volumes.sh
@@ -3,5 +3,5 @@
 # These are used across backup, restore, create, and destroy operations
 
 get_gitea_volumes() {
-    echo "volume:datavolume:${DATA_VOLUME}"
+    echo "path:data:${DATA_PATH}"
 }
diff --git a/gitea-server/backup.sh b/gitea-server/backup.sh
index a2a0b21..43c48ad 100755
--- a/gitea-server/backup.sh
+++ b/gitea-server/backup.sh
@@ -3,7 +3,7 @@
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/_volumes.sh"
-_check_required_env_vars "CONTAINER_NAME" "DATA_VOLUME"
+_check_required_env_vars "CONTAINER_NAME" "DATA_PATH"
 
 # BACKUP SCRIPT
 # Creates a backup of the Gitea data volume
diff --git a/gitea-server/config/.template_info.env b/gitea-server/config/.template_info.env
index 93fc31e..e3fb701 100644
--- a/gitea-server/config/.template_info.env
+++ b/gitea-server/config/.template_info.env
@@ -11,6 +11,3 @@ REQUIRES_DOCKER_ROOT=false
 # Image settings
 IMAGE_REGISTRY="docker.io"
 IMAGE_REPO="gitea/gitea"
-
-# Volume settings
-DATA_VOLUME="${CONTAINER_NAME}_data"
diff --git a/gitea-server/config/service.env b/gitea-server/config/service.env
index d9c8122..dba6892 100644
--- a/gitea-server/config/service.env
+++ b/gitea-server/config/service.env
@@ -6,6 +6,9 @@ IMAGE_TAG="latest"
 # Server Settings
 SSH_USER="root"
 
+# Data path on host (contains git/, gitea/, ssh/ subdirectories)
+DATA_PATH="/home/dropshell/gitea"
+
 # Gitea ports
 HTTP_PORT=3000
 SSH_PORT=2222
diff --git a/gitea-server/destroy.sh b/gitea-server/destroy.sh
index 1c695f8..8fd67c6 100755
--- a/gitea-server/destroy.sh
+++ b/gitea-server/destroy.sh
@@ -3,7 +3,7 @@
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/_volumes.sh"
-_check_required_env_vars "CONTAINER_NAME" "DATA_VOLUME"
+_check_required_env_vars "CONTAINER_NAME" "DATA_PATH"
 
 # DESTROY SCRIPT
 # Completely removes the service AND all data
diff --git a/gitea-server/install.sh b/gitea-server/install.sh
index f56af68..0d7fb34 100755
--- a/gitea-server/install.sh
+++ b/gitea-server/install.sh
@@ -3,10 +3,10 @@
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/_volumes.sh"
-_check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "DATA_VOLUME"
+_check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "DATA_PATH"
 
 # shellcheck disable=SC2046
-create_items $(get_gitea_volumes) || _die "Failed to create volume $DATA_VOLUME"
+create_items $(get_gitea_volumes) || _die "Failed to create data directory $DATA_PATH"
 
 _check_docker_installed || _die "Docker test failed, aborting installation..."
 
diff --git a/gitea-server/restore.sh b/gitea-server/restore.sh
index 177ca7d..262aa4c 100755
--- a/gitea-server/restore.sh
+++ b/gitea-server/restore.sh
@@ -3,7 +3,7 @@
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/_volumes.sh"
-_check_required_env_vars "CONTAINER_NAME" "DATA_VOLUME"
+_check_required_env_vars "CONTAINER_NAME" "DATA_PATH"
 
 # RESTORE SCRIPT
 # Restores Gitea data from a backup
diff --git a/gitea-server/start.sh b/gitea-server/start.sh
index 655e43f..3089861 100755
--- a/gitea-server/start.sh
+++ b/gitea-server/start.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 source "${AGENT_PATH}/common.sh"
-_check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "DATA_VOLUME" "HTTP_PORT" "SSH_PORT"
+_check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "DATA_PATH" "HTTP_PORT" "SSH_PORT"
 
 # START SCRIPT
 # The start script is required for all templates.
@@ -11,7 +11,7 @@ DOCKER_RUN_CMD="docker run -d \
                 --name ${CONTAINER_NAME} \
                 -p ${HTTP_PORT}:3000 \
                 -p ${SSH_PORT}:22 \
-                -v ${DATA_VOLUME}:/data \
+                -v ${DATA_PATH}:/data \
                 -e USER_UID=1000 \
                 -e USER_GID=1000 \
                 ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG}"