From 086b359e174ed7a740a9d7f89e80ad02660cf97b Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Thu, 8 Sep 2022 17:13:20 +0200
Subject: [PATCH] barrel: Rename 'REAL_PATH' => 'DATA_PATH'

---
 distillery/resources/compose/barrel/.env.sample        | 2 +-
 distillery/resources/compose/barrel/docker-compose.yml | 6 +++---
 distillery/resources/templates/docker-env/barrel       | 2 +-
 env/instances.go                                       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/distillery/resources/compose/barrel/.env.sample b/distillery/resources/compose/barrel/.env.sample
index fa89528..2d8200e 100644
--- a/distillery/resources/compose/barrel/.env.sample
+++ b/distillery/resources/compose/barrel/.env.sample
@@ -3,7 +3,7 @@
 #######################
 
 # Real path for volumes to be stored
-REAL_PATH=/var/www/deploy/instances/example.slug
+DATA_PATH=/var/www/deploy/instances/example.slug/data
 UTILS_DIR=/var/www/deploy/runtime/utils/
 
 #######################
diff --git a/distillery/resources/compose/barrel/docker-compose.yml b/distillery/resources/compose/barrel/docker-compose.yml
index a53cf32..34ca677 100644
--- a/distillery/resources/compose/barrel/docker-compose.yml
+++ b/distillery/resources/compose/barrel/docker-compose.yml
@@ -22,9 +22,9 @@ services:
     # volumes that are mounted
     volumes:
       - ${GLOBAL_AUTHORIZED_KEYS_FILE}:/var/www/.ssh/global_authorized_keys:ro
-      - ${REAL_PATH}/.composer:/var/www/.composer
-      - ${REAL_PATH}/data:/var/www/data
-      - ${REAL_PATH}/authorized_keys:/var/www/.ssh/authorized_keys
+      - ${DATA_PATH}/.composer:/var/www/.composer
+      - ${DATA_PATH}/data:/var/www/data
+      - ${DATA_PATH}/authorized_keys:/var/www/.ssh/authorized_keys
       - ${UTILS_DIR}:/utils:ro
 
 networks:
diff --git a/distillery/resources/templates/docker-env/barrel b/distillery/resources/templates/docker-env/barrel
index 3b77071..89c8c51 100644
--- a/distillery/resources/templates/docker-env/barrel
+++ b/distillery/resources/templates/docker-env/barrel
@@ -1,4 +1,4 @@
-REAL_PATH=${REAL_PATH}
+DATA_PATH=${DATA_PATH}
 UTILS_DIR=${UTILS_DIR}
 
 SLUG=${SLUG}
diff --git a/env/instances.go b/env/instances.go
index 5538644..ef77b36 100644
--- a/env/instances.go
+++ b/env/instances.go
@@ -233,7 +233,7 @@ func (instance Instance) Stack() stack.Installable {
 
 		EnvFileResource: filepath.Join("resources", "templates", "docker-env", "barrel"),
 		EnvFileContext: map[string]string{
-			"REAL_PATH": instance.FilesystemBase,
+			"DATA_PATH": filepath.Join(instance.FilesystemBase, "data"),
 
 			"SLUG":         instance.Slug,
 			"VIRTUAL_HOST": instance.Domain(),