Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #18293: #1627

Merged
merged 1 commit into from
Oct 8, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions bootstrap-promises/failsafe.cf
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,34 @@ body common control
tls_min_version => "1.2";
}


body server control
{
# Listen on correct port from the beginning
# Listen on correct port from the beginning
port => "5309";
}

body agent control
{
@if feature(copyfrom_restrict_keys)
known_policy_server::
copyfrom_restrict_keys => { "${rudder_update_conf.policy_server_hash}" };
@endif
}

bundle common rudder_update_conf
{
vars:
"policy_server_hash_file" => "${sys.workdir}/ppkeys/policy_server_hash";
known_policy_server::
"policy_server_hash" string => readfile("${policy_server_hash_file}");

classes:
"known_policy_server" expression => fileexists("${policy_server_hash_file}"),
scope => "namespace";
"trust_new_server" not => "known_policy_server",
scope => "namespace";
}

# WARN: this bundle comes from update.cf
bundle common server_info
{
Expand Down Expand Up @@ -139,14 +160,15 @@ body copy_from remote(server, path)
servers => {
"${server}"
};
trustkey => "true";
source => "${path}";
compare => "digest";
preserve => "false";
verify => "true";
purge => "true";
copy_backup => "false";
portnumber => "5309";
trust_new_server.!root_server::
trustkey => "true";
}

body copy_from local(from)
Expand Down