255497fd2e43579122381bcd26b7bc581ad0e160 — Timothée Floure 1 year, 7 months ago 370d8b2
Merge `config.exs` and `config.example.exs`
2 files changed, 5 insertions(+), 40 deletions(-)

D config/config.example.exs
M config/config.exs
D config/config.example.exs => config/config.example.exs +0 -37
@@ 1,37 0,0 @@-# This file is responsible for configuring your application
- # and its dependencies with the aid of the Mix.Config module.
- use Mix.Config
- 
- # This configuration is loaded before any dependency and is restricted
- # to this project. If another project depends on this project, this
- # file won't be loaded nor affect the parent project. For this reason,
- # if you want to provide default values for your application for
- # 3rd-party users, it should be done in your "mix.exs" file.
- 
- # You can configure for your application as:
- #
- #     config :hanabi, key: :value
- #
- # And access this configuration in your application as:
- #
- #     Application.get_env(:hanabi, :key)
- #
- # Or configure a 3rd-party app:
- #
- #     config :logger, level: :info
- #
- 
- # It is also possible to import configuration files, relative to this
- # directory. For example, you can emulate configuration per environment
- # by uncommenting the line below and defining dev.exs, test.exs and such.
- # Configuration from the imported file will override the ones defined
- # here (which is why it is important to import them last).
- #
- #     import_config "#{Mix.env}.exs"
- 
- config :hanabi, port: 6667,
-                 hostname: "irc.localhost",
-                 motd: "/path/to/motd.txt",
-                 network_name: "Hanabi Demo",
-                 network_created_on: "on 2017-12-04 17:22"
-                 # , password: "mypassword"

M config/config.exs => config/config.exs +5 -3
@@ 28,12 28,14 @@ # here (which is why it is important to import them last).
  #
  #     import_config "#{Mix.env}.exs"
+ #
+ 
  config :hanabi, port: 6667,
                  hostname: "irc.localhost",
-                 motd: "/tmp/motd.txt",
+                 motd: "/path/to/motd.txt",
                  network_name: "Hanabi Demo",
-                 network_created_on: "2017-12-04 17:22"
-                 #password: "tototo"
+                 network_created_on: "on 2017-12-04 17:22"
+                 # , password: "mypassword"
  
  config :logger, :console,
    format: "$time $metadata[$level] $levelpad$message\n",