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 #8134: Do not use proxy when calling localhost in techniques #901

Merged
merged 1 commit into from
Apr 1, 2016
Merged

Fixes #8134: Do not use proxy when calling localhost in techniques #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion initial-promises/node-server/server-roles/1.0/alive-check.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ bundle agent generic_alive_check(app)

root_server::

"/usr/bin/curl -s ${site_to_check} |/bin/grep -q OK"
"/usr/bin/curl --proxy '' -s ${site_to_check} |/bin/grep -q OK"
contain => in_shell_silent,
classes => set_persist_classes_alivecheck("site_ok", "${failed_result_class}", "@{generic_alive_check.cleanup_failed_classes}", "${site_failure_persist_time}"),
comment => "Checking if ${site_to_check} is alive";
Expand Down
2 changes: 1 addition & 1 deletion initial-promises/node-server/server-roles/1.0/password-check.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ bundle agent root_password_check_dav

classes:

"dav_cant_connect" not => returnszero("/usr/bin/curl -s -f -o /dev/null -u ${g.davuser}:${g.davpw} -T /opt/rudder/etc/uuid.hive http://localhost/inventory-updates/uuid.hive","noshell");
"dav_cant_connect" not => returnszero("/usr/bin/curl --proxy '' -s -f -o /dev/null -u ${g.davuser}:${g.davpw} -T /opt/rudder/etc/uuid.hive http://localhost/inventory-updates/uuid.hive","noshell");


files:
Expand Down
2 changes: 1 addition & 1 deletion initial-promises/node-server/server-roles/1.0/technique-reload.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ bundle agent root_technique_reload

root_technique_reload_trigger::

"/usr/bin/curl -s ${root_technique_reload_rest_url} |/bin/grep -q OK"
"/usr/bin/curl --proxy '' -s ${root_technique_reload_rest_url} |/bin/grep -q OK"
contain => in_shell_silent,
classes => rudder_common_classes("root_technique_reload_rest_call"),
comment => "Reload the Technique library using the Rudder API";
Expand Down
2 changes: 1 addition & 1 deletion initial-promises/rootServerInitialPromises/cfengine-nova/distributePolicy/aliveCheck.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ bundle agent generic_alive_check(site_to_check)

commands:

"/usr/bin/curl -s ${site_to_check} |/bin/grep -q OK"
"/usr/bin/curl --proxy '' -s ${site_to_check} |/bin/grep -q OK"
contain => in_shell_silent,
classes => set_persist_classes_alivecheck("site_ok", "${failed_result_class}", "@{generic_alive_check.cleanup_failed_classes}", "${site_failure_persist_time}"),
comment => "Checking if ${site_to_check} is alive";
Expand Down
2 changes: 1 addition & 1 deletion techniques/system/server-roles/1.0/alive-check.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ bundle agent generic_alive_check(app)

root_server::

"/usr/bin/curl -s ${site_to_check} |/bin/grep -q OK"
"/usr/bin/curl --proxy '' -s ${site_to_check} |/bin/grep -q OK"
contain => in_shell_silent,
classes => set_persist_classes_alivecheck("site_ok", "${failed_result_class}", "@{generic_alive_check.cleanup_failed_classes}", "${site_failure_persist_time}"),
comment => "Checking if ${site_to_check} is alive";
Expand Down
2 changes: 1 addition & 1 deletion techniques/system/server-roles/1.0/password-check.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ bundle agent root_password_check_dav

classes:

"dav_cant_connect" not => returnszero("/usr/bin/curl -s -f -o /dev/null -u ${g.davuser}:${g.davpw} -T /opt/rudder/etc/uuid.hive http://localhost/inventory-updates/uuid.hive","noshell");
"dav_cant_connect" not => returnszero("/usr/bin/curl --proxy '' -s -f -o /dev/null -u ${g.davuser}:${g.davpw} -T /opt/rudder/etc/uuid.hive http://localhost/inventory-updates/uuid.hive","noshell");

files:

Expand Down
2 changes: 1 addition & 1 deletion techniques/system/server-roles/1.0/technique-reload.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ bundle agent root_technique_reload

root_technique_reload_trigger::

"/usr/bin/curl -s ${root_technique_reload_rest_url} |/bin/grep -q OK"
"/usr/bin/curl --proxy '' -s ${root_technique_reload_rest_url} |/bin/grep -q OK"
contain => in_shell_silent,
classes => rudder_common_classes("root_technique_reload_rest_call"),
comment => "Reload the Technique library using the Rudder API";
Expand Down