From d9367fd4acd5365ec07a6ec4f3fc58f017569420 Mon Sep 17 00:00:00 2001
From: Florian Schwarz <florian.schwarz@inovex.de>
Date: Thu, 12 Dec 2024 13:55:20 +0100
Subject: [PATCH] Combine gitignore

---
 .gitignore            | 6 +++++-
 deployment/.gitignore | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 deployment/.gitignore

diff --git a/.gitignore b/.gitignore
index 4cf3f17248..26bacf4d4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,11 @@ ui-debug.log
 /.vscode
 
 # env files
-server/.env
+server/**/.env
+deployment/**/.env
+
+# keys
+**/jwt.key
 
 # script output
 scripts/out
diff --git a/deployment/.gitignore b/deployment/.gitignore
deleted file mode 100644
index a9dfb59935..0000000000
--- a/deployment/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-**/.env
-**/jwt.key
\ No newline at end of file