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 #13745: change the detection of curl path in ncf to use rudder_curl if available #862

Conversation

ncharles
Copy link
Member

# Use rudder_curl variable if available, rather than the path[curl]
bundle common ncf_path {
vars:
"ncf_curl" string => "${g.rudder_curl}",
Copy link
Member

Choose a reason for hiding this comment

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

Could you put it in a path array for consistency with stdlib?

Copy link
Member

Choose a reason for hiding this comment

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

And name the bundle ncf_paths?

Copy link
Member

Choose a reason for hiding this comment

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

BTW I like this idea of overriding stdlib in ncf 👍

@ncharles ncharles force-pushed the bug_13745/change_the_detection_of_curl_path_in_ncf_to_use_rudder_curl_if_available branch from 24f5891 to 65175fb Compare October 31, 2018 09:02
@ncharles
Copy link
Member Author

Commit modified

unless => isvariable("g.rudder_curl");


"all_paths" slist => getindices("path");
Copy link
Member

Choose a reason for hiding this comment

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

👍

"path[curl]" string => "${g.rudder_curl}",
if => isvariable("g.rudder_curl");

"path[curl]" string => "${paths.path[curl]}",
Copy link
Member

Choose a reason for hiding this comment

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

great!

@Normation-Quality-Assistant
Copy link
Contributor

OK, merging this PR

@Normation-Quality-Assistant Normation-Quality-Assistant merged commit 65175fb into Normation:branches/rudder/4.3 Oct 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants