From c3ad1026eedc80215dacf96d297a507c8d111d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Fri, 15 Sep 2023 13:21:11 +0200
Subject: [PATCH] linkace: move conf to main .env

---
 .env               | 5 ++++-
 docker-compose.yml | 2 --
 linkace.env        | 3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 linkace.env

diff --git a/.env b/.env
index f064c7e..05e628d 100644
--- a/.env
+++ b/.env
@@ -97,4 +97,7 @@ GITEA_WEBUI_INTERNAL_PORT=3000
 GITEA_SSH_EXTERNAL_PORT=2022
 GITEA_SSH_INTERNAL_PORT=22
 LINKACE_EXTERNAL_PORT=8084
-LINKACE_INTERNAL_PORT=80
\ No newline at end of file
+LINKACE_INTERNAL_PORT=80
+LINKACE_DB=linkace
+LINKACE_DB_USERNAME=linkace
+LINKACE_DB_PASSWORD=zghhRS&FdK6niiJg5Q5Nr3E4
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index db06653..86342b9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -734,8 +734,6 @@ services:
       - public
       - mariadb
       - redis
-    env_file:
-      - linkace.env
     environment:
       - DB_CONNECTION=mysql
       - DB_HOST=${MYSQL_SERVER}
diff --git a/linkace.env b/linkace.env
deleted file mode 100644
index f0cc888..0000000
--- a/linkace.env
+++ /dev/null
@@ -1,3 +0,0 @@
-LINKACE_DB=linkace
-LINKACE_DB_USERNAME=linkace
-LINKACE_DB_PASSWORD=zghhRS&FdK6niiJg5Q5Nr3E4
\ No newline at end of file