diff options
| author | rinpatch <rinpatch@sdf.org> | 2018-12-03 00:34:04 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2018-12-03 00:34:04 +0300 |
| commit | 343b0adfa6c88f0934d788be0e59ea8a5fe483b1 (patch) | |
| tree | a6debba90a247854543aad4069f1b2e3d9ebd1b1 /config/dev.exs | |
| parent | a3953ca37ab4122772119ae345705e712e23dd17 (diff) | |
| parent | 371d96b1da85960dafea9665b8bc32ba553b1555 (diff) | |
| download | pleroma-343b0adfa6c88f0934d788be0e59ea8a5fe483b1.tar.gz pleroma-343b0adfa6c88f0934d788be0e59ea8a5fe483b1.zip | |
Merge branch 'develop' into fix/theora-detection-read-bytes
Diffstat (limited to 'config/dev.exs')
| -rw-r--r-- | config/dev.exs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/config/dev.exs b/config/dev.exs index 7b06ad67e..166be721a 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -49,11 +49,10 @@ config :pleroma, Pleroma.Repo, hostname: "localhost", pool_size: 10 -try do +if File.exists?("./config/dev.secret.exs") do import_config "dev.secret.exs" -rescue - _ -> - IO.puts( - "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs" - ) +else + IO.puts( + "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs" + ) end |