spacecruft/farmbot_os
spacecruft/farmbot_os
1
0
Fork 0
Code Issues Pull requests Releases Activity

Fix mixfile merge conflict.

Browse source
This commit is contained in:
Connor Rigby 2017-11-29 12:37:07 -08:00
parent cbec15d25f
commit 8859a38d54
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/config.exs
View file

@ -40,7 +40,8 @@ config :wobserver,
config :farmbot, :behaviour,
authorization: Farmbot.Bootstrap.Authorization,
firmware_handler: Farmbot.Firmware.StubHandler,
http_adapter: Farmbot.HTTP.HTTPoisonAdapter
http_adapter: Farmbot.HTTP.HTTPoisonAdapter,
gpio_handler: Farmbot.System.GPIO.StubHandler
config :farmbot, :farmware,
first_part_farmware_manifest_url: "https://raw.githubusercontent.com/FarmBot-Labs/farmware_manifests/master/manifest.json"
@ -52,9 +53,8 @@ case target do
import_config("host/#{env}.exs")
_ ->
import_config("#{target}/#{env}.exs")
if File.exists?("config/#{target}/#{env}.exs") do
import_config("#{target}/#{env}.exs")
else
import_config("target/#{env}.exs")
end

4
config/target/dev.exs
View file

@ -44,7 +44,6 @@ config :farmbot, :init, [
]
config :farmbot, :transport, [
# Farmbot.BotState.Transport.GenMQTT,
Farmbot.BotState.Transport.AMQP,
Farmbot.BotState.Transport.HTTP,
]
@ -54,7 +53,8 @@ config :farmbot, :behaviour,
authorization: Farmbot.Bootstrap.Authorization,
system_tasks: Farmbot.Target.SystemTasks,
firmware_handler: Farmbot.Firmware.StubHandler,
update_handler: Farmbot.Target.UpdateHandler
update_handler: Farmbot.Target.UpdateHandler,
gpio_handler: Farmbot.Target.GPIO.AleHandler
local_file = Path.join(System.user_home!(), ".ssh/id_rsa.pub")
local_key = if File.exists?(local_file) do