diff options
| author | Gabe <redhatrises@gmail.com> | 2015-12-04 14:52:03 -0700 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2015-12-11 18:46:10 +0100 |
| commit | 5c9b9089b7b0d40b7e924177f99c2568aaa1b5b2 (patch) | |
| tree | e92145418e1d30eaa6c28376f90e198d0ebe84db /ipaplatform | |
| parent | 14a44ea47bf9a617019ebc91fbe272215c428d82 (diff) | |
| download | freeipa-5c9b9089b7b0d40b7e924177f99c2568aaa1b5b2.tar.gz freeipa-5c9b9089b7b0d40b7e924177f99c2568aaa1b5b2.tar.xz freeipa-5c9b9089b7b0d40b7e924177f99c2568aaa1b5b2.zip | |
Migrate wget references and usage to curl
https://fedorahosted.org/freeipa/ticket/5458
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaplatform')
| -rw-r--r-- | ipaplatform/base/paths.py | 2 | ||||
| -rw-r--r-- | ipaplatform/redhat/services.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 9ee488f9f..762a38136 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -179,7 +179,7 @@ class BasePathNamespace(object): SSS_SSH_KNOWNHOSTSPROXY = "/usr/bin/sss_ssh_knownhostsproxy" BIN_TIMEOUT = "/usr/bin/timeout" UPDATE_CA_TRUST = "/usr/bin/update-ca-trust" - BIN_WGET = "/usr/bin/wget" + BIN_CURL = "/usr/bin/curl" ZIP = "/usr/bin/zip" BIND_LDAP_SO = "/usr/lib/bind/ldap.so" BIND_LDAP_DNS_IPA_WORKDIR = "/var/named/dyndb-ldap/ipa/" diff --git a/ipaplatform/redhat/services.py b/ipaplatform/redhat/services.py index 0902215a5..75bf57bc2 100644 --- a/ipaplatform/redhat/services.py +++ b/ipaplatform/redhat/services.py @@ -213,10 +213,10 @@ class RedHatCAService(RedHatService): } args = [ - paths.BIN_WGET, - '-S', '-O', '-', - '--timeout=30', - '--no-check-certificate', + paths.BIN_CURL, + '-o', '-', + '--connect-timeout', '30', + '-k', url ] |