diff --git a/.gitattributes b/.gitattributes index 519aebf..42d4987 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ # Zorg dat omgevingsspecifieke bestanden nooit worden overschreven bij merges tussen dev en main config/config.php merge=ours includes/env_badge.php merge=ours + diff --git a/.env.example b/config/.env.example similarity index 100% rename from .env.example rename to config/.env.example diff --git a/config/config.php b/config/config.php index 0ae6173..b311cb0 100644 --- a/config/config.php +++ b/config/config.php @@ -6,9 +6,10 @@ $envVars = []; -// 1. Zoek naar .env of val terug op .env.example +// 1. Zoek naar .env of val terug op config/.env.example $envCandidates = [ __DIR__ . '/../.env', + __DIR__ . '/.env.example', __DIR__ . '/../.env.example', ];