diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/config.exs | 4 | ||||
-rw-r--r-- | config/dev.exs | 4 | ||||
-rw-r--r-- | config/prod.exs | 2 | ||||
-rw-r--r-- | config/prod.secret.exs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index db48b00..95f5c4c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -5,14 +5,14 @@ # is restricted to this project. # General application configuration -use Mix.Config +import Config # Configures the endpoint config :waev, WaevWeb.Endpoint, url: [host: "localhost"], secret_key_base: "3Nj9X0/OrNnXhxVD+0HWwKCyGzEUsHrBSbnLNlX/y4SyVR934OWoIqs2+GYm993q", render_errors: [view: WaevWeb.ErrorView, accepts: ~w(html json)], - pubsub: [name: Waev.PubSub, adapter: Phoenix.PubSub.PG2] + pubsub_server: Waev.PubSub # Configures Elixir's Logger config :logger, :console, diff --git a/config/dev.exs b/config/dev.exs index 829869d..ce6fe09 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -1,4 +1,4 @@ -use Mix.Config +import Config # For development, we disable any cache and enable # debugging and code reloading. @@ -16,7 +16,7 @@ config :waev, WaevWeb.Endpoint, "node_modules/webpack/bin/webpack.js", "--mode", "development", - "--watch-stdin", + "--watch", cd: Path.expand("../assets", __DIR__) ] ] diff --git a/config/prod.exs b/config/prod.exs index b800a52..d1bcc5d 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -1,4 +1,4 @@ -use Mix.Config +import Config # For production, don't forget to configure the url host # to something meaningful, Phoenix uses this information diff --git a/config/prod.secret.exs b/config/prod.secret.exs index 35d6f07..bf8ee51 100644 --- a/config/prod.secret.exs +++ b/config/prod.secret.exs @@ -2,7 +2,7 @@ # from environment variables. You can also hardcode secrets, # although such is generally not recommended and you have to # remember to add this file to your .gitignore. -use Mix.Config +import Config secret_key_base = System.get_env("SECRET_KEY_BASE") || |