Fixes #14816: Remove -1 option that overrides --tls1.2

Normation · May 3, 2019 · f6432e4 · f6432e4
1 parent 96d6eca
commit f6432e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/techniques/system/distributePolicy/1.0/propagatePromises.cf b/techniques/system/distributePolicy/1.0/propagatePromises.cf
@@ -240,14 +240,14 @@ bundle agent sendInventoryToCmdb
     !disable_upload.policy_server.!(root_server|role_rudder_relay_top|role_rudder_relay_promises_only)::
 
       "${g.rudder_inventories}/incoming"
-        transformer => "${g.rudder_curl} --tlsv1.2 -k -1 -f -s --proxy '' --user rudder:rudder -T ${this.promiser}  https://${server_info.policy_server}/inventories/",
+        transformer => "${g.rudder_curl} --tlsv1.2 --insecure --fail --silent --proxy '' --user rudder:rudder --upload-file ${this.promiser} https://${server_info.policy_server}/inventories/",
         depth_search => recurse_visible(1),
         file_select => all_inventory_files,
         classes => rudder_common_classes("rudder_inventory_relay"),
         comment => "Sending an inventory to the root server";
 
       "${g.rudder_inventories}/accepted-nodes-updates"
-        transformer => "${g.rudder_curl} --tlsv1.2 -k -1 -f -s --proxy '' --user ${g.davuser}:${g.davpw} -T ${this.promiser}  https://${server_info.policy_server}/inventory-updates/",
+        transformer => "${g.rudder_curl} --tlsv1.2 --insecure --fail --silent --proxy '' --user ${g.davuser}:${g.davpw} --upload-file ${this.promiser} https://${server_info.policy_server}/inventory-updates/",
         depth_search => recurse_visible(1),
         file_select => all_inventory_files,
         classes => rudder_common_classes("rudder_inventory_relay"),

diff --git a/techniques/system/inventory/1.0/fusionAgent.st b/techniques/system/inventory/1.0/fusionAgent.st
@@ -139,7 +139,7 @@ bundle agent download_server_uuid
   vars:
 
     # curl should always be available now
-      "download_command"   string => "${g.rudder_curl} --tlsv1.2 -L -k -1 -s -f --proxy '' -o \"${sys.workdir}/rudder-server-uuid.txt\" https://${server_info.policy_server}/uuid";
+      "download_command"   string => "${g.rudder_curl} --tlsv1.2 --location --insecure --silent --fail --proxy '' --output \"${sys.workdir}/rudder-server-uuid.txt\" https://${server_info.policy_server}/uuid";
 
   methods:
     could_not_download_uuid::
@@ -286,7 +286,7 @@ bundle agent sendInventory
 
     any::
     # curl is always available now
-      "download_command_prefix"   string => "${g.rudder_curl} --tlsv1.2 -L -k -1 -f -s --proxy '' --user ${g.davuser}:${g.davpw} -T";
+      "download_command_prefix"   string => "${g.rudder_curl} --tlsv1.2 --location --insecure --fail --silent --proxy '' --user ${g.davuser}:${g.davpw} --upload-file";
       "download_command_suffix"   string => "${download_endpoint}";
 
   classes:

diff --git a/techniques/system/server-roles/1.0/password-check.cf b/techniques/system/server-roles/1.0/password-check.cf
@@ -294,7 +294,7 @@ bundle agent root_password_check_dav
 
   classes:
 
-      "dav_cant_connect" not => returnszero("${g.rudder_curl} --tlsv1.2 --proxy '' -k -s -f -o /dev/null -u ${g.davuser}:${g.davpw} -T /opt/rudder/etc/uuid.hive https://localhost/inventory-updates/uuid.hive","noshell");
+      "dav_cant_connect" not => returnszero("${g.rudder_curl} --tlsv1.2 --proxy '' --insecure --silent --fail --output /dev/null --user ${g.davuser}:${g.davpw} --send-file /opt/rudder/etc/uuid.hive https://localhost/inventory-updates/uuid.hive","noshell");
 
     any::
       "pass3" expression => "pass2";