From e0acff267b6f143b25b3d4dd8a4085639da055dc Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 23 Mar 2021 15:18:22 +0100 Subject: [PATCH] Fix some dev config Signed-off-by: Thomas Citharel --- .gitignore | 1 + config/dev.exs | 17 ----------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 845929f4a..4804240ad 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ erl_crash.dump # secrets files as long as you replace their contents by environment # variables. /config/*.secret.exs +/config/runtime.exs /setup_db.psql diff --git a/config/dev.exs b/config/dev.exs index 3209d7e56..970788f9c 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -97,20 +97,3 @@ config :mobilizon, :anonymous, reports: [ allowed: true ] - -require Logger - -cond do - System.get_env("INSTANCE_CONFIG") && - File.exists?("./config/#{System.get_env("INSTANCE_CONFIG")}") -> - import_config System.get_env("INSTANCE_CONFIG") - - System.get_env("DOCKER", "false") == "false" && File.exists?("./config/dev.secret.exs") -> - import_config "dev.secret.exs" - - System.get_env("DOCKER", "false") == "true" -> - Logger.info("Using environment configuration for Docker") - - true -> - Logger.error("No configuration file found") -end