pim/esrom
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove phoenix config from nerves config.

Browse source
This commit is contained in:
Pim Kunis 2019-07-31 12:04:36 +02:00
parent 7ff72c56c5
commit 4569869d6a
4 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
firmware/config/config.exs
View file

@ -5,6 +5,8 @@
# is restricted to this project. # is restricted to this project.
use Mix.Config use Mix.Config
import_config "../../ui/config/config.exs"
config :firmware, target: Mix.target() config :firmware, target: Mix.target()
# Customize non-Elixir parts of the firmware. See # Customize non-Elixir parts of the firmware. See
@ -26,16 +28,6 @@ config :shoehorn,
config :logger, backends: [RingLogger] config :logger, backends: [RingLogger]
config :ui, UiWeb.Endpoint,
url: [host: "localhost"],
http: [port: 80],
secret_key_base: "HEY05EB1dFVSu6KykKHuS4rQPQzSHv4F7mGVB/gnDLrIu75wE/ytBXy2TaL3A6RA",
root: Path.dirname(__DIR__),
server: true,
render_errors: [view: UiWeb.ErrorView, accepts: ~w(html json)],
pubsub: [name: Nerves.PubSub, adapter: Phoenix.PubSub.PG2],
code_reloader: false
config :phoenix, :json_library, Jason config :phoenix, :json_library, Jason
if Mix.target() != :host do if Mix.target() != :host do

1
ui/config/config.exs
View file

@ -9,7 +9,6 @@ use Mix.Config
# Configures the endpoint # Configures the endpoint
config :ui, UiWeb.Endpoint, config :ui, UiWeb.Endpoint,
url: [host: "localhost"],
secret_key_base: "FkfuB09FEncz4aAi6hS6w5bsNast+D1P12MckXr5dlRdhtFJrKqgEhvhpTU3qzgh", secret_key_base: "FkfuB09FEncz4aAi6hS6w5bsNast+D1P12MckXr5dlRdhtFJrKqgEhvhpTU3qzgh",
render_errors: [view: UiWeb.ErrorView, accepts: ~w(html json)], render_errors: [view: UiWeb.ErrorView, accepts: ~w(html json)],
pubsub: [name: Ui.PubSub, adapter: Phoenix.PubSub.PG2] pubsub: [name: Ui.PubSub, adapter: Phoenix.PubSub.PG2]

1
ui/config/prod.exs
View file

@ -11,7 +11,6 @@ use Mix.Config
# before starting your production server. # before starting your production server.
config :ui, UiWeb.Endpoint, config :ui, UiWeb.Endpoint,
url: [host: "www.geokunis2.nl", port: 80], url: [host: "www.geokunis2.nl", port: 80],
check_origin: false,
cache_static_manifest: "priv/static/cache_manifest.json" cache_static_manifest: "priv/static/cache_manifest.json"
# Do not print debug messages in production # Do not print debug messages in production

1
ui/config/prod.secret.exs
View file

@ -12,7 +12,6 @@ secret_key_base =
""" """
config :ui, UiWeb.Endpoint, config :ui, UiWeb.Endpoint,
http: [:inet6, port: String.to_integer(System.get_env("PORT") || "4000")],
secret_key_base: secret_key_base secret_key_base: secret_key_base
# ## Using releases (Elixir v1.9+) # ## Using releases (Elixir v1.9+)