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

allow fpf to be opt out

Browse source
This commit is contained in:
connor rigby 2017-10-31 13:46:01 -07:00
parent 43deb4aaf3
commit 1d86dc644f
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/farmbot/farmware/installer/repository/sync_task.ex
View file

@ -6,8 +6,6 @@ defmodule Farmbot.Farmware.Installer.Repository.SyncTask do
alias Farmbot.Farmware.Installer
alias Farmbot.Farmware.Installer.Repository
@fpf_url Application.get_env(:farmbot, :farmware)[:first_part_farmware_manifest_url] || raise "First party farmware url needs to be configured"
@doc false
def start_link(_) do
Task.start_link(__MODULE__, :sync_all, [])
@ -16,8 +14,16 @@ defmodule Farmbot.Farmware.Installer.Repository.SyncTask do
def sync_all do
Logger.debug "Syncing all repos. This may take a while."
import Ecto.Query
unless Farmbot.System.ConfigStorage.one(from r in Repository, where: r.url == @fpf_url) do
Installer.add_repo(@fpf_url)
# first party farmware url could be nil. This would mean it is disabled.
fpf_url = ConfigStorage.get_config_value(:string, "settings", "first_party_farmware_url")
# if fpf_url isn't nil, check if its been enabled, if not enable it.
if fpf_url do
unless Farmbot.System.ConfigStorage.one(from r in Repository, where: r.url == ^fpf_url) do
Installer.add_repo(fpf_url)
end
else
Logger.warn "First party farmware is disabled."
end
repos = ConfigStorage.all(Repository)

2
priv/config_storage/migrations/20170922221449_seed_groups.exs
View file

@ -48,6 +48,8 @@ defmodule Farmbot.System.ConfigStorage.Migrations.SeedGroups do
create_value(BoolValue, true) |> create_config(group_id, "first_boot")
create_value(BoolValue, true) |> create_config(group_id, "first_party_farmware")
create_value(StringValue, nil) |> create_config(group_id, "timezone")
fpf_url = Application.get_env(:farmbot, :farmware)[:first_part_farmware_manifest_url]
create_value(StringValue, fpf_url) |> create_config(group_id, "first_party_farmware_url")
end
defp populate_config_values("user_env", group_id) do