From f117dcb17a4488450b92dbd4c6f66dcdb0f973f2 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 31 Oct 2023 16:44:52 +0100 Subject: [PATCH] Internal: Rename .env to .env.dist. Developers should rename their .env.local to .env (more missing references) --- .github/workflows/behat.yml | 6 +++--- .gitignore | 1 + public/main/install/index.php | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/behat.yml b/.github/workflows/behat.yml index 39b94bed34..6c9402cd50 100644 --- a/.github/workflows/behat.yml +++ b/.github/workflows/behat.yml @@ -148,9 +148,9 @@ jobs: ../../vendor/behat/behat/bin/behat features/actionInstall.feature -vvv cd .. cd .. - sed -i "s/APP_ENV='dev'/APP_ENV='prod'/g" .env.local - sed -i "s/APP_DEBUG='1'/APP_DEBUG='0'/g" .env.local - sed -i "s/MAILER_DSN=sendmail:\/\/default/MAILER_DSN=null:\/\/null/g" .env.local + sed -i "s/APP_ENV='dev'/APP_ENV='prod'/g" .env + sed -i "s/APP_DEBUG='1'/APP_DEBUG='0'/g" .env + sed -i "s/MAILER_DSN=sendmail:\/\/default/MAILER_DSN=null:\/\/null/g" .env sudo php bin/console cache:clear sudo chmod -R 777 var public diff --git a/.gitignore b/.gitignore index cd603434bb..0b9570b890 100755 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ composer.lock symfony.lock ###> symfony/framework-bundle ### +/.env /.env.local /.env.local.php /.env.*.local diff --git a/public/main/install/index.php b/public/main/install/index.php index 374605b819..000f731fb1 100644 --- a/public/main/install/index.php +++ b/public/main/install/index.php @@ -429,9 +429,9 @@ if (isset($_POST['step2'])) { } if ($isPendingMigration) { - $envFile = api_get_path(SYMFONY_SYS_PATH) . '.env.local'; + $envFile = api_get_path(SYMFONY_SYS_PATH) . '.env'; $dotenv = new Dotenv(); - $envFile = api_get_path(SYMFONY_SYS_PATH) . '.env.local'; + $envFile = api_get_path(SYMFONY_SYS_PATH) . '.env'; $dotenv->loadEnv($envFile); $stepData['dbHostForm'] = $_ENV['DATABASE_HOST']; $stepData['dbPortForm'] = $_ENV['DATABASE_PORT']; @@ -485,7 +485,7 @@ if (isset($_POST['step2'])) { } else { $dotenv = new Dotenv(); - $envFile = api_get_path(SYMFONY_SYS_PATH) . '.env.local'; + $envFile = api_get_path(SYMFONY_SYS_PATH) . '.env'; $dotenv->loadEnv($envFile); }