From 898e096005ba266b1d714114d0359f390927eaaa Mon Sep 17 00:00:00 2001
From: KsmoinO <99479-KsmoinO@users.noreply.framagit.org>
Date: Sat, 19 Nov 2022 19:37:02 +0100
Subject: [PATCH] HedgeDoc - Fix 15/x

---
 podman-hedgedoc/10_install.sh | 4 +++-
 podman-hedgedoc/vars.sh       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/podman-hedgedoc/10_install.sh b/podman-hedgedoc/10_install.sh
index 45a3ffa..87f35a0 100755
--- a/podman-hedgedoc/10_install.sh
+++ b/podman-hedgedoc/10_install.sh
@@ -60,6 +60,8 @@ MYSQL_PASSWORD=${GARBAYE_HEDGEDOC_DATABASE_PASSWORD}
 MYSQL_DATABASE=hedgedoc
 EOT
 
+cat .env
+
 export hedgedoc_image
 export hedgedoc_version
 export database_image
@@ -71,7 +73,7 @@ if ! podman image exists ${hedgedoc_image}:${hedgedoc_version}; then
     podman image pull ${hedgedoc_image}:${hedgedoc_version} || exit 1
 fi
 if ! podman image exists ${database_image}:${database_version}; then
-    podman pull ${database_image}:${database_version} || exit 1
+    podman image pull ${database_image}:${database_version} || exit 1
 fi
 podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
 echo -n "Waiting for hedgedoc to finish starting " &&
diff --git a/podman-hedgedoc/vars.sh b/podman-hedgedoc/vars.sh
index dbda5a0..2b6a27f 100644
--- a/podman-hedgedoc/vars.sh
+++ b/podman-hedgedoc/vars.sh
@@ -11,7 +11,7 @@ project_name=${PWD##*/}
 pod_name="pod_${project_name}"
 service_name="pod-${pod_name}.service"
 upstream_images="${hedgedoc_image} ${postgres_image}"
-datavolume="${project_name}_data"
-dbvolume="${project_name}_database"
+datavolume="data"
+dbvolume="database"
 container_name="${project_name}_app"
 db_container_name="${project_name}_database"