diff options
| author | lain <lain@soykaf.club> | 2019-06-20 17:43:57 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-06-20 17:43:57 +0000 |
| commit | 3b48876cf02b35af953bf463987e42675a9e6180 (patch) | |
| tree | 584217291832436738724043ee8f52e1eae6d9fa /config | |
| parent | ba584364e905531417dae2e07675dbbf60c3a007 (diff) | |
| parent | 32320c1ee94a999082f10c9f9a3c6d55ced21e21 (diff) | |
| download | pleroma-3b48876cf02b35af953bf463987e42675a9e6180.tar.gz pleroma-3b48876cf02b35af953bf463987e42675a9e6180.zip | |
Merge branch 'fix/dynamic-configuration' into 'develop'
Fixes for dynamic configuration
See merge request pleroma/pleroma!1313
Diffstat (limited to 'config')
| -rw-r--r-- | config/dev.exs | 4 | ||||
| -rw-r--r-- | config/prod.exs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/dev.exs b/config/dev.exs index 71b11f7c3..7e1e3b4be 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -60,5 +60,5 @@ else ) end -if File.exists?("./config/dev.migrated.secret.exs"), - do: import_config("./config/dev.migrated.secret.exs") +if File.exists?("./config/dev.exported_from_db.secret.exs"), + do: import_config("dev.exported_from_db.secret.exs") diff --git a/config/prod.exs b/config/prod.exs index 42edccf64..9c205cbd2 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -64,5 +64,5 @@ config :logger, level: :warn # which should be versioned separately. import_config "prod.secret.exs" -if File.exists?("./config/prod.migrated.secret.exs"), - do: import_config("./config/prod.migrated.secret.exs") +if File.exists?("./config/prod.exported_from_db.secret.exs"), + do: import_config("prod.exported_from_db.secret.exs") |