Deployment and lifecycle management for Nix
client: fix default config values
+9
-9
+9
-9
apps/sower_client/lib/sower_client/config.ex
+9
-9
apps/sower_client/lib/sower_client/config.ex
···
39
39
},
40
40
name: %Schema{
41
41
type: :string,
42
-
description: "Agent name (agent-only)",
43
-
default: "system hostname"
42
+
description: "Agent name (agent-only)"
44
43
},
45
44
state_directory: %Schema{
46
45
type: :string,
47
-
description: "Directory where state files are written (agent-only)",
48
-
default: "/var/lib/sower_agent"
46
+
description: "Directory where state files are written (agent-only)"
49
47
},
50
48
subscriptions: %Schema{
51
49
type: :array,
···
67
65
68
66
config_path = resolve_config_path(opts)
69
67
70
-
Keyword.get(opts, :defaults, %{})
68
+
defaults()
69
+
|> Map.merge(Keyword.get(opts, :defaults, %{}))
71
70
|> Map.merge(read_config_file(config_path))
72
71
|> then(fn cfg ->
73
72
if File.exists?(config_path) do
···
92
91
|> process_side_effects()
93
92
end
94
93
95
-
def defaults do
94
+
def defaults() do
96
95
%{
97
-
"name" => default_agent_name(),
98
-
"state_directory" => default_state_dir()
96
+
"name" => default_client_name(),
97
+
"state_directory" => default_state_dir(),
98
+
"default" => "/var/lib/sower-agent"
99
99
}
100
100
end
101
101
···
159
159
)
160
160
end
161
161
162
-
def default_agent_name do
162
+
def default_client_name() do
163
163
:inet.gethostname() |> then(fn {:ok, hostname} -> to_string(hostname) end)
164
164
end
165
165