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.

Sign up for GitHub

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

Jump to bottom

Fixes #18293: #1627

Merged
merged 1 commit into from
Oct 8, 2020
Merged

Fixes #18293: #1627

merged 1 commit into from
Oct 8, 2020

Conversation

amousset
Copy link
Member

@amousset amousset commented Oct 5, 2020

@amousset amousset requested a review from peckpeck October 5, 2020 14:41
@amousset
Copy link
Member Author

amousset commented Oct 5, 2020

Commit modified

@amousset
Copy link
Member Author

amousset commented Oct 5, 2020

Commit modified

@amousset
Copy link
Member Author

amousset commented Oct 5, 2020

Commit modified

ncharles
ncharles reviewed Oct 5, 2020
View reviewed changes
bootstrap-promises/failsafe.cf Outdated
source => "${path}";
compare => "digest";
preserve => "false";
verify => "true";
purge => "true";
copy_backup => "false";
portnumber => "5309";
trust_key::
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
trust_key::
trust_key.!root_server::

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not! (root server is normally never in bootstrap policies but just in case)

@amousset
Copy link
Member Author

amousset commented Oct 5, 2020

PR updated with a new commit

@amousset amousset requested a review from ncharles October 6, 2020 19:55
@amousset
Copy link
Member Author

amousset commented Oct 6, 2020

I'll replace this with something based on a file containing the policy server's key hash

@amousset
Copy link
Member Author

amousset commented Oct 7, 2020

PR updated with a new commit

@amousset
Copy link
Member Author

amousset commented Oct 7, 2020

PR updated with a new commit

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/rudder-techniques/pull/1627
-- Your faithful QA
Kant merge: "Science is organized knowledge. Wisdom is organized life."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/30701/console)

@peckpeck
Copy link
Member

peckpeck commented Oct 8, 2020

This one needs a manual merge, but is it still a wip ?

@amousset
Copy link
Member Author

amousset commented Oct 8, 2020

OK, squash merging this PR

@amousset amousset merged commit 09053a0 into Normation:branches/rudder/6.0 Oct 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncharles ncharles ncharles approved these changes

@peckpeck peckpeck Awaiting requested review from peckpeck

Assignees
No one assigned
Labels
qa: Can't merge Trigger test WIP
Projects
None yet
Milestone
No milestone
4 participants
@amousset @Normation-Quality-Assistant @peckpeck @ncharles