Remove terraform usage

diff --git a/bin/postinst b/bin/postinst
index ba740c74573c40240408f6929bac0ebababd3ffc..d15d34dee61e1ea5c277843118d827cf3e9657a9 100644 (file)
--- a/bin/postinst
+++ b/bin/postinst
@@ -68,7 +68,7 @@ create_authkeys() {
     echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZ3QNzqiDE6jUzmXnOzIM93mZBPZtSDbCgYQd8xwOz9ZROxqLcckr8qIvyLFDv/fedwQlLDTg90LGX/zHHAB0T+0DB2dMFOWeSloIMMp+0WwG9i6H0ty6NUVSktvG6h4jbgkhMhHGUEHhxgR2LgxTjq8fpcMOLJ4HLLGW9W3BQOVtoi8hiffKm5DB9Au0HgNvXP/UrCQkBtFzMyhRb7D7aFyDyU/7SuM6m17DIYNx1cg79AH3mjRTQXaOVBrOBJ4uaqy6srbGzWs5FSIMMbgOrcmZRw5GilrG5dBbT/OQSN+sHlECx216pyLrbSWcwG1Fo11iI53pnColRUljMIPJ+XRffxT2yINEfyvfr0GGMKi4c5fcDumgYwT2+foefy72sBhNwKhzjuGySPgRU/1PH8oIcu4TJWyW1xi0AfVZnJhjU5RKeWQ9VMhh1nDntpRdD5z+0FrAL+9AINW4Bjboc6OisikIABBeoT9mbYNNGdHA7rpdJwURycJDpJDhyr0voNnmQ15JF6KZebM0+OW9apTxdotKPKYJ8pFBRGXrTENSVvFNIBbYD55IJ2MlOD2eX6XX2/tnHMdZHCE9Gi22Y8p1oiahLtCU3Th8WwazQlh4H9xAJzK0jp7MOpI3Y553i8zBU47VpO5juELH2bCNwChpdbZbY0i6MxQF61d2iJw== create-vmware-tpl@pixelpark.com" >> /root/.ssh/authorized_keys
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cat "${tmp_file}" >> /root/.ssh/authorized_keys
     fi
@@ -93,7 +93,7 @@ import_ssh_hostkeys() {
         for fullname in "${stem}" "${stem}.pub" ; do
             tmp_file=$( mktemp )
             url="${COBBLER_URL}/custom/create-vmware-tpl/keys/${fullname}"
-            wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}"
+            curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}"
             if [[ -s "${tmp_file}" ]] ; then
                 mv -v "${tmp_file}" "/etc/ssh/${fullname}"
                 if [[ "${stem}" == "${fullname}" ]] ; then
@@ -361,7 +361,7 @@ install_epel() {
         tgt="/etc/yum.repos.d/${bname}"
         echo
         echo "Retrieving '${url}' -> '${tgt}' ..."
-        if wget -O "${tgt}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${bname}' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -381,7 +381,7 @@ install_epel() {
         tgt="/etc/pki/rpm-gpg/${bname}"
         echo
         echo "Retrieving '${url}' -> '${tgt}' ..."
-        if wget -O "${tgt}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${bname}' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -425,7 +425,7 @@ install_pp_tcsh_env() {
     local local_tar=$( mktemp -p /tmp "linux_tcsh.XXXXXXXX.tar" )
 
     echo "Local tar file: '${local_tar}'."
-    if wget -O "${local_tar}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+    if curl -s -S -o "${local_tar}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'linux_tcsh.tar' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -447,7 +447,7 @@ install_pp_tcsh_env() {
     url="${COBBLER_URL}/custom/create-vmware-tpl/files/fbr.sh"
     local tgt="/etc/profile.d/fbr.sh"
     echo "Retrieving '${url}' -> '${tgt}' ..."
-    if wget -O "${tgt}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}"; then
+    if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'fbr.sh' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -552,7 +552,7 @@ create_motd() {
     echo
     log "Creating initial /etc/motd ..."
     local mk_script=$( mktemp -p /tmp "mk_create_motd.XXXXXXXXXX.ksh" )
-    if wget -O "${mk_script}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+    if curl -s -S -o "${mk_script}" --connect-timeout=3 --expect100-timeout=3 "${url}"; then
         chmod 0755 "${mk_script}"
         "${mk_script}" -i 192.168.88.0/23 \
                        -p "Template VM" \
@@ -1059,7 +1059,7 @@ config_logrotate() {
     local tgt="/etc/logrotate.conf"
 
     echo "Getting ${url} => ${tgt} ..."
-    if wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+    if curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'logrotate.conf' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -1074,7 +1074,7 @@ config_logrotate() {
         tgt="/etc/logrotate.d/${base}"
         cp -v /dev/null "${tmp_file}"
         echo "Getting ${url} => ${tgt} ..."
-        if wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${base}' from '${url}'." | tee -a "${ERROR_POINTER}"

diff --git a/bin/postinst.chrony b/bin/postinst.chrony
index f881ae45979abda8a09aef0ee6f0e4b563bbfbcb..adc5d08bf4b4805b53dd24cffacab391ede5c9fa 100644 (file)
--- a/bin/postinst.chrony
+++ b/bin/postinst.chrony
@@ -64,7 +64,7 @@ create_authkeys() {
     echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZ3QNzqiDE6jUzmXnOzIM93mZBPZtSDbCgYQd8xwOz9ZROxqLcckr8qIvyLFDv/fedwQlLDTg90LGX/zHHAB0T+0DB2dMFOWeSloIMMp+0WwG9i6H0ty6NUVSktvG6h4jbgkhMhHGUEHhxgR2LgxTjq8fpcMOLJ4HLLGW9W3BQOVtoi8hiffKm5DB9Au0HgNvXP/UrCQkBtFzMyhRb7D7aFyDyU/7SuM6m17DIYNx1cg79AH3mjRTQXaOVBrOBJ4uaqy6srbGzWs5FSIMMbgOrcmZRw5GilrG5dBbT/OQSN+sHlECx216pyLrbSWcwG1Fo11iI53pnColRUljMIPJ+XRffxT2yINEfyvfr0GGMKi4c5fcDumgYwT2+foefy72sBhNwKhzjuGySPgRU/1PH8oIcu4TJWyW1xi0AfVZnJhjU5RKeWQ9VMhh1nDntpRdD5z+0FrAL+9AINW4Bjboc6OisikIABBeoT9mbYNNGdHA7rpdJwURycJDpJDhyr0voNnmQ15JF6KZebM0+OW9apTxdotKPKYJ8pFBRGXrTENSVvFNIBbYD55IJ2MlOD2eX6XX2/tnHMdZHCE9Gi22Y8p1oiahLtCU3Th8WwazQlh4H9xAJzK0jp7MOpI3Y553i8zBU47VpO5juELH2bCNwChpdbZbY0i6MxQF61d2iJw== create-vmware-tpl@pixelpark.com" >> /root/.ssh/authorized_keys
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cat "${tmp_file}" >> /root/.ssh/authorized_keys
     fi
@@ -89,7 +89,7 @@ import_ssh_hostkeys() {
         for fullname in "${stem}" "${stem}.pub" ; do
             tmp_file=$( mktemp )
             url="${COBBLER_URL}/custom/create-vmware-tpl/keys/${fullname}"
-            wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}"
+            curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}"
             if [[ -s "${tmp_file}" ]] ; then
                 mv -v "${tmp_file}" "/etc/ssh/${fullname}"
                 if [[ "${stem}" == "${fullname}" ]] ; then
@@ -347,7 +347,7 @@ install_epel() {
         tgt="/etc/yum.repos.d/${bname}"
         echo
         echo "Retrieving '${url}' -> '${tgt}' ..."
-        if wget -O "${tgt}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${bname}' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -367,7 +367,7 @@ install_epel() {
         tgt="/etc/pki/rpm-gpg/${bname}"
         echo
         echo "Retrieving '${url}' -> '${tgt}' ..."
-        if wget -O "${tgt}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${bname}' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -411,7 +411,7 @@ install_pp_tcsh_env() {
     local local_tar=$( mktemp -p /tmp "linux_tcsh.XXXXXXXX.tar" )
 
     echo "Local tar file: '${local_tar}'."
-    if wget -O "${local_tar}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+    if curl -s -S -o "${local_tar}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'linux_tcsh.tar' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -433,7 +433,7 @@ install_pp_tcsh_env() {
     url="${COBBLER_URL}/custom/create-vmware-tpl/files/fbr.sh"
     local tgt="/etc/profile.d/fbr.sh"
     echo "Retrieving '${url}' -> '${tgt}' ..."
-    if wget -O "${tgt}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}"; then
+    if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'fbr.sh' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -538,7 +538,7 @@ create_motd() {
     echo
     log "Creating initial /etc/motd ..."
     local mk_script=$( mktemp -p /tmp "mk_create_motd.XXXXXXXXXX.ksh" )
-    if wget -O "${mk_script}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+    if curl -s -S -o "${mk_script}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
         chmod 0755 "${mk_script}"
         "${mk_script}" -i 192.168.88.0/23 \
                        -p "Template VM" \
@@ -1098,7 +1098,7 @@ config_logrotate() {
     local tgt="/etc/logrotate.conf"
 
     echo "Getting ${url} => ${tgt} ..."
-    if wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+    if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'logrotate.conf' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -1113,7 +1113,7 @@ config_logrotate() {
         tgt="/etc/logrotate.d/${base}"
         cp -v /dev/null "${tmp_file}"
         echo "Getting ${url} => ${tgt} ..."
-        if wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${base}' from '${url}'." | tee -a "${ERROR_POINTER}"

diff --git a/etc/cobbler-distros.d/almalinux-8.yaml b/etc/cobbler-distros.d/almalinux-8.yaml
index b3b8055005d069e6a828e038b5ac4d4dd62782e3..035378bcb639f845c63e0e716b0ec11254b75992 100644 (file)
--- a/etc/cobbler-distros.d/almalinux-8.yaml
+++ b/etc/cobbler-distros.d/almalinux-8.yaml
@@ -36,7 +36,6 @@ cobbler-distros:
       - 'tmux'
       - 'traceroute'
       - 'vim'
-      - 'wget'
       - 'yum-utils'
       - '-abrt*'
       - '-nfs*'

diff --git a/etc/cobbler-distros.d/centos-7.yaml b/etc/cobbler-distros.d/centos-7.yaml
index 72034d31895a386f760d62b0a1cfdcb36d77f9e9..cdd5d4884edb6cfe89137805f362b1938d1b7a8a 100644 (file)
--- a/etc/cobbler-distros.d/centos-7.yaml
+++ b/etc/cobbler-distros.d/centos-7.yaml
@@ -41,7 +41,6 @@ cobbler-distros:
       - 'tmux'
       # - 'traceroute'
       - 'vim'
-      - 'wget'
       # - 'yum-utils'
       - '-iwl*'
       - '-mysql-community*'

diff --git a/etc/cobbler-distros.d/centos-stream-8.yaml b/etc/cobbler-distros.d/centos-stream-8.yaml
index 8c7522bea4c605765c533cd79652db0b58ef61eb..3fc556b47f0476b0fca6d7ca1ffcd10b57abee46 100644 (file)
--- a/etc/cobbler-distros.d/centos-stream-8.yaml
+++ b/etc/cobbler-distros.d/centos-stream-8.yaml
@@ -50,7 +50,6 @@ cobbler-distros:
       - 'tmux'
       # - 'traceroute'
       - 'vim'
-      - 'wget'
       # - 'yum-utils'
       - '-abrt*'
       - '-iwl*'

diff --git a/etc/cobbler-distros.d/centos-stream-9.yaml b/etc/cobbler-distros.d/centos-stream-9.yaml
index 3f2c1803b24ba4f8c41d0fcb3a97132e8e632551..e7bc6d492fc813665cbcd571e91691a6d14b4d70 100644 (file)
--- a/etc/cobbler-distros.d/centos-stream-9.yaml
+++ b/etc/cobbler-distros.d/centos-stream-9.yaml
@@ -48,7 +48,6 @@ cobbler-distros:
       - 'tmux'
       - 'traceroute'
       - 'vim'
-      - 'wget'
       - 'yum-utils'
       - '-abrt*'
       - '-nfs*'

diff --git a/etc/cobbler-distros.d/oel-7.yaml b/etc/cobbler-distros.d/oel-7.yaml
index 3706795a111184104afe934cb68378831a22b1da..47a9b97285f855d4652ce59785572f7d136a0205 100644 (file)
--- a/etc/cobbler-distros.d/oel-7.yaml
+++ b/etc/cobbler-distros.d/oel-7.yaml
@@ -45,7 +45,6 @@ cobbler-distros:
       - 'tmux'
       # - 'traceroute'
       - 'vim'
-      - 'wget'
       # - 'yum-utils'
       - '-iwl*'
       - '-mysql-community*'

diff --git a/etc/cobbler-distros.d/rhel-9.yaml b/etc/cobbler-distros.d/rhel-9.yaml
index 0afa1b081331ef415efa824e089ab5d5e03bb68a..03e3a13259b708b6bdf962a67cac7990ee8faf44 100644 (file)
--- a/etc/cobbler-distros.d/rhel-9.yaml
+++ b/etc/cobbler-distros.d/rhel-9.yaml
@@ -38,7 +38,6 @@ cobbler-distros:
       - 'tmux'
       # - 'traceroute'
       - 'vim'
-      - 'wget'
       # - 'yum-utils'
       - '-abrt*'
       - '-iwl*'

diff --git a/etc/cobbler-distros.d/rocky-8.yaml b/etc/cobbler-distros.d/rocky-8.yaml
index 7677329818fda18fe620f85e4270c108a0b86130..217d1e46d1cdf3d050268c7a6acaf913c1f14400 100644 (file)
--- a/etc/cobbler-distros.d/rocky-8.yaml
+++ b/etc/cobbler-distros.d/rocky-8.yaml
@@ -48,7 +48,6 @@ cobbler-distros:
       - 'tmux'
       - 'traceroute'
       - 'vim'
-      - 'wget'
       - 'yum-utils'
       - '-abrt*'
       - '-nfs*'

diff --git a/kickstart/dpx-rocky8-test.ks b/kickstart/dpx-rocky8-test.ks
index a81f7f89c8a2b2058837814aaf5937a2e93da37f..71014745e30be85e1ee49ca0d1dbaee441e3dfbe 100644 (file)
--- a/kickstart/dpx-rocky8-test.ks
+++ b/kickstart/dpx-rocky8-test.ks
@@ -80,7 +80,6 @@ tcpdump
 traceroute
 tmux
 vim
-wget
 yum-utils
 %end
 

diff --git a/kickstart/pp_standard_centos8_vmware.ks b/kickstart/pp_standard_centos8_vmware.ks
index a57f1d84fa91111741e478540643b324fea0d2f8..c0ec4868bd006a3c74eeaff58d327ae784f9866d 100644 (file)
--- a/kickstart/pp_standard_centos8_vmware.ks
+++ b/kickstart/pp_standard_centos8_vmware.ks
@@ -89,7 +89,6 @@ tcpdump
 telnet
 tmux
 vim
-wget
 yum-utils
 %end
 

diff --git a/kickstart/profile.rhel-9.2.develop.ks b/kickstart/profile.rhel-9.2.develop.ks
index 5ad86b42701297a3cde727cd6cbd8df1a39c9a0b..36017e00f2c2954a32ddbc1b91db2178745c6b8d 100644 (file)
--- a/kickstart/profile.rhel-9.2.develop.ks
+++ b/kickstart/profile.rhel-9.2.develop.ks
@@ -97,7 +97,6 @@ telnet
 tmux
 traceroute
 vim
-wget
 yum-utils
 -abrt*
 -nfs*

diff --git a/kickstart/profile.vmware-template-centos7.ks b/kickstart/profile.vmware-template-centos7.ks
index 653904b9e51af272c9be99b3423dae0956c70bd8..21e68f46bab4c794c283b8e904afb6ef71f588a7 100644 (file)
--- a/kickstart/profile.vmware-template-centos7.ks
+++ b/kickstart/profile.vmware-template-centos7.ks
@@ -90,7 +90,6 @@ tcpdump
 telnet
 tmux
 vim
-wget
 yum-utils
 -mysql-community*
 %end

diff --git a/kickstart/profile.vmware-template-centos8.ks b/kickstart/profile.vmware-template-centos8.ks
index 2a78b9da5b116bd371a722b470ee589cd8a8ea77..f667658025fc23d773b3f317f135d7e286ab8bdf 100644 (file)
--- a/kickstart/profile.vmware-template-centos8.ks
+++ b/kickstart/profile.vmware-template-centos8.ks
@@ -86,7 +86,6 @@ tcpdump
 traceroute
 tmux
 vim
-wget
 yum-utils
 %end
 

diff --git a/kickstart/profile.vmware-template-oel7.ks b/kickstart/profile.vmware-template-oel7.ks
index 794a31f49bbe538eccdee5368dec39704a15c3fb..328248fbafd9fd51dbe629f364d807627853a83a 100644 (file)
--- a/kickstart/profile.vmware-template-oel7.ks
+++ b/kickstart/profile.vmware-template-oel7.ks
@@ -89,7 +89,6 @@ tcpdump
 telnet
 tmux
 vim
-wget
 yum-utils
 -mysql-community*
 -*uek*

diff --git a/kickstart/template-centos7.ks b/kickstart/template-centos7.ks
index 481b137d60dbda07c27ad5f25ff42ea5894e508c..30e1b02d5ffb31d52d125183469520e44e5fd951 100644 (file)
--- a/kickstart/template-centos7.ks
+++ b/kickstart/template-centos7.ks
@@ -93,7 +93,6 @@ tcpdump
 telnet
 tmux
 vim
-wget
 yum-utils
 -mysql-community*
 %end

diff --git a/kickstart/template-centos8.ks b/kickstart/template-centos8.ks
index c497c3fcffd311863399269353ff9c93ead7ba86..115d1ff3fbb093b6da0bd54fef193d8d5f4bbb24 100644 (file)
--- a/kickstart/template-centos8.ks
+++ b/kickstart/template-centos8.ks
@@ -92,7 +92,6 @@ tcpdump
 telnet
 tmux
 vim
-wget
 yum-utils
 %end
 

diff --git a/kickstart/template-oel7.ks b/kickstart/template-oel7.ks
index 5b48bf263015fa8b00ac5dbc68fd760a81de8355..18e0e4e683b74c64fefe58a294c2d3ef7ea9ae18 100644 (file)
--- a/kickstart/template-oel7.ks
+++ b/kickstart/template-oel7.ks
@@ -92,7 +92,6 @@ tcpdump
 telnet
 tmux
 vim
-wget
 yum-utils
 -mysql-community*
 -*uek*

diff --git a/snippets/tpl.010.authkeys.sh b/snippets/tpl.010.authkeys.sh
index cafb3ff93026d773c108f9f9f817f5a423a3de2b..d8ae8865a33c52e42368f0353adae788661582a0 100644 (file)
--- a/snippets/tpl.010.authkeys.sh
+++ b/snippets/tpl.010.authkeys.sh
@@ -20,7 +20,7 @@ create_authkeys() {
     echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZ3QNzqiDE6jUzmXnOzIM93mZBPZtSDbCgYQd8xwOz9ZROxqLcckr8qIvyLFDv/fedwQlLDTg90LGX/zHHAB0T+0DB2dMFOWeSloIMMp+0WwG9i6H0ty6NUVSktvG6h4jbgkhMhHGUEHhxgR2LgxTjq8fpcMOLJ4HLLGW9W3BQOVtoi8hiffKm5DB9Au0HgNvXP/UrCQkBtFzMyhRb7D7aFyDyU/7SuM6m17DIYNx1cg79AH3mjRTQXaOVBrOBJ4uaqy6srbGzWs5FSIMMbgOrcmZRw5GilrG5dBbT/OQSN+sHlECx216pyLrbSWcwG1Fo11iI53pnColRUljMIPJ+XRffxT2yINEfyvfr0GGMKi4c5fcDumgYwT2+foefy72sBhNwKhzjuGySPgRU/1PH8oIcu4TJWyW1xi0AfVZnJhjU5RKeWQ9VMhh1nDntpRdD5z+0FrAL+9AINW4Bjboc6OisikIABBeoT9mbYNNGdHA7rpdJwURycJDpJDhyr0voNnmQ15JF6KZebM0+OW9apTxdotKPKYJ8pFBRGXrTENSVvFNIBbYD55IJ2MlOD2eX6XX2/tnHMdZHCE9Gi22Y8p1oiahLtCU3Th8WwazQlh4H9xAJzK0jp7MOpI3Y553i8zBU47VpO5juELH2bCNwChpdbZbY0i6MxQF61d2iJw== create-vmware-tpl@pixelpark.com" >> /root/.ssh/authorized_keys
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cat "${tmp_file}" >> /root/.ssh/authorized_keys
     fi

diff --git a/snippets/tpl.080.rsyslogd-el7.sh b/snippets/tpl.080.rsyslogd-el7.sh
index 11e9a38950fbee4d356af1a9480dccaaf6da1696..ed0e41fe212edee5f113e1ac1f3c1dc95cc67456 100644 (file)
--- a/snippets/tpl.080.rsyslogd-el7.sh
+++ b/snippets/tpl.080.rsyslogd-el7.sh
@@ -32,7 +32,7 @@ set_rsyslogd_el7() {
     log "Rewriting /etc/rsyslog.conf ..."
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url_top}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_top}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/rsyslog.conf /etc/rsyslog.conf.orig
         mv -v "${tmp_file}" /etc/rsyslog.conf
@@ -44,7 +44,7 @@ set_rsyslogd_el7() {
     log "Rewriting /etc/rsyslog.d/50_rsyslog.conf ..."
 
     tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url_sub}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_sub}" || true
     if [[ -s "${tmp_file}" ]] ; then
         mv -v "${tmp_file}" /etc/rsyslog.d/50_rsyslog.conf
         chmod -v 0644 /etc/rsyslog.d/50_rsyslog.conf

diff --git a/snippets/tpl.080.rsyslogd-el8.sh b/snippets/tpl.080.rsyslogd-el8.sh
index 5d2ca47a16d4d4f3e1c68e6f8c3c1f019b492b95..2128fad37c65fa01292fe2cd53087844b15d8703 100644 (file)
--- a/snippets/tpl.080.rsyslogd-el8.sh
+++ b/snippets/tpl.080.rsyslogd-el8.sh
@@ -32,7 +32,7 @@ set_rsyslogd_el8() {
     log "Rewriting /etc/rsyslog.conf ..."
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url_top}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_top}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/rsyslog.conf /etc/rsyslog.conf.orig
         mv -v "${tmp_file}" /etc/rsyslog.conf
@@ -44,7 +44,7 @@ set_rsyslogd_el8() {
     log "Rewriting /etc/rsyslog.d/50_rsyslog.conf ..."
 
     tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url_sub}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_sub}" || true
     if [[ -s "${tmp_file}" ]] ; then
         mv -v "${tmp_file}" /etc/rsyslog.d/50_rsyslog.conf
         chmod -v 0644 /etc/rsyslog.d/50_rsyslog.conf

diff --git a/snippets/tpl.080.rsyslogd-el9.sh b/snippets/tpl.080.rsyslogd-el9.sh
index 33673333583b276f871f5faccbb3558a311285d9..3cb232bb3aeb133a6a0005d1bb64a71244328b27 100644 (file)
--- a/snippets/tpl.080.rsyslogd-el9.sh
+++ b/snippets/tpl.080.rsyslogd-el9.sh
@@ -32,7 +32,7 @@ set_rsyslogd_el9() {
     log "Rewriting /etc/rsyslog.conf ..."
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url_top}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_top}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/rsyslog.conf /etc/rsyslog.conf.orig
         mv -v "${tmp_file}" /etc/rsyslog.conf
@@ -44,7 +44,7 @@ set_rsyslogd_el9() {
     log "Rewriting /etc/rsyslog.d/50_rsyslog.conf ..."
 
     tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url_sub}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_sub}" || true
     if [[ -s "${tmp_file}" ]] ; then
         mv -v "${tmp_file}" /etc/rsyslog.d/50_rsyslog.conf
         chmod -v 0644 /etc/rsyslog.d/50_rsyslog.conf

diff --git a/snippets/tpl.170.repos_centos7.sh b/snippets/tpl.170.repos_centos7.sh
index d1368c92a445ad6719f0698a9b33267ef660f31e..647d71042d59f1c81e1041fb931bc17cc45d2ec4 100644 (file)
--- a/snippets/tpl.170.repos_centos7.sh
+++ b/snippets/tpl.170.repos_centos7.sh
@@ -20,7 +20,7 @@ get_repos_centos7() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi

diff --git a/snippets/tpl.170.repos_oel7.sh b/snippets/tpl.170.repos_oel7.sh
index 838c7c5a74d899769adf9b09515b4b03c453686f..ffd5de4b2bac89cd22e0e2669a6f00eb346a2377 100644 (file)
--- a/snippets/tpl.170.repos_oel7.sh
+++ b/snippets/tpl.170.repos_oel7.sh
@@ -20,7 +20,7 @@ get_repos_oel7() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi

diff --git a/snippets/tpl.175.repos_el7.sh b/snippets/tpl.175.repos_el7.sh
index beb62a9026ec40fa5b1d5bc2821f683e5ed02921..e87b3b1b199f2c4c68f6771ae95dcb56a30b553f 100644 (file)
--- a/snippets/tpl.175.repos_el7.sh
+++ b/snippets/tpl.175.repos_el7.sh
@@ -20,7 +20,7 @@ get_repos_el7() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi

diff --git a/snippets/tpl.180.repos_almalinux8.sh b/snippets/tpl.180.repos_almalinux8.sh
index 96c2f12bacc37e7df14d2cefd4146c0a5fb4632d..1fb3ed492ecec6165360e686bdb267dd945f62a7 100644 (file)
--- a/snippets/tpl.180.repos_almalinux8.sh
+++ b/snippets/tpl.180.repos_almalinux8.sh
@@ -21,7 +21,7 @@ get_repos_almalinux8() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi

diff --git a/snippets/tpl.180.repos_centos8.sh b/snippets/tpl.180.repos_centos8.sh
index 67d2cc3bb6209f472e2cbe09f2a6f6424ce0cf1f..50561996b6cb4da6435a77a692d449e746ead001 100644 (file)
--- a/snippets/tpl.180.repos_centos8.sh
+++ b/snippets/tpl.180.repos_centos8.sh
@@ -21,7 +21,7 @@ get_repos_centos8() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi

diff --git a/snippets/tpl.180.repos_rocky8.sh b/snippets/tpl.180.repos_rocky8.sh
index 9a3772f450f9582bda1c757666ee1c246822c424..4fa1695a4950ab48ddef55095cf5c598eccbaf26 100644 (file)
--- a/snippets/tpl.180.repos_rocky8.sh
+++ b/snippets/tpl.180.repos_rocky8.sh
@@ -21,7 +21,7 @@ get_repos_rocky8() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi

diff --git a/snippets/tpl.185.repos_el8.sh b/snippets/tpl.185.repos_el8.sh
index 766750137d25f98b97b65a79ce6037485c74dd2a..165c95380a78cef5772b3820854dd2729c67f370 100644 (file)
--- a/snippets/tpl.185.repos_el8.sh
+++ b/snippets/tpl.185.repos_el8.sh
@@ -20,7 +20,7 @@ get_repos_el8() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi

diff --git a/snippets/tpl.190.repos_almalinux9.sh b/snippets/tpl.190.repos_almalinux9.sh
index 43928a19af2d5e4c6b508dd1ced85e8843b61115..252892b7a8c48d04091ba15d5511016addb4089e 100644 (file)
--- a/snippets/tpl.190.repos_almalinux9.sh
+++ b/snippets/tpl.190.repos_almalinux9.sh
@@ -22,7 +22,7 @@ get_repos_almalinux9() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi

diff --git a/snippets/tpl.190.repos_centos9.sh b/snippets/tpl.190.repos_centos9.sh
index 189d3030bff7408973f00e3363c380f2890e10e6..6b588a189a14437934c0e6649a0f0f017c2c901f 100644 (file)
--- a/snippets/tpl.190.repos_centos9.sh
+++ b/snippets/tpl.190.repos_centos9.sh
@@ -20,7 +20,7 @@ get_repos_centos9() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi

diff --git a/snippets/tpl.190.repos_rhel9.sh b/snippets/tpl.190.repos_rhel9.sh
index 9cd23700ed02910690e455e8add0c79cb3b65f00..37f3e92b2ea2401a547b1d39ca6c8accb569b50e 100644 (file)
--- a/snippets/tpl.190.repos_rhel9.sh
+++ b/snippets/tpl.190.repos_rhel9.sh
@@ -48,7 +48,7 @@ get_repos_rhel9() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             sed -i -e "s|\${REPO_SERVER}|${redhat_repo_server}|g" \
                    -e "s|\${PATH_PREFIX}|${redhat_repo_path_prefix}|g" \

diff --git a/snippets/tpl.195.repos_el9.sh b/snippets/tpl.195.repos_el9.sh
index 8fb170e613b2e68707d843fc3a3990fc507341d1..3f16940e509d5f51218a99f741144bdf169874c5 100644 (file)
--- a/snippets/tpl.195.repos_el9.sh
+++ b/snippets/tpl.195.repos_el9.sh
@@ -20,7 +20,7 @@ get_repos_el9() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi

diff --git a/snippets/tpl.205.bashrc-el7.sh b/snippets/tpl.205.bashrc-el7.sh
index 170904d48f1b1c1f5f2097d62b136b1dd2d5b948..3e8a13c1df996ede1b7d2e4335909a7a9667c422 100644 (file)
--- a/snippets/tpl.205.bashrc-el7.sh
+++ b/snippets/tpl.205.bashrc-el7.sh
@@ -15,7 +15,7 @@ set_bashrc_el7() {
     log "Rewriting /etc/bashrc ..."
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/bashrc /etc/bashrc.original
         mv -v "${tmp_file}" /etc/bashrc

diff --git a/snippets/tpl.210.bashrc-el8.sh b/snippets/tpl.210.bashrc-el8.sh
index 28f351d868a0411804c8299f214519c1f45ba28b..1ad73198d09a282d90229447c9a187e00f4cdb7d 100644 (file)
--- a/snippets/tpl.210.bashrc-el8.sh
+++ b/snippets/tpl.210.bashrc-el8.sh
@@ -15,7 +15,7 @@ set_bashrc_centos8() {
     log "Rewriting /etc/bashrc ..."
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/bashrc /etc/bashrc.original
         mv -v "${tmp_file}" /etc/bashrc

diff --git a/snippets/tpl.211.bashrc-el9.sh b/snippets/tpl.211.bashrc-el9.sh
index 28f351d868a0411804c8299f214519c1f45ba28b..1ad73198d09a282d90229447c9a187e00f4cdb7d 100644 (file)
--- a/snippets/tpl.211.bashrc-el9.sh
+++ b/snippets/tpl.211.bashrc-el9.sh
@@ -15,7 +15,7 @@ set_bashrc_centos8() {
     log "Rewriting /etc/bashrc ..."
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/bashrc /etc/bashrc.original
         mv -v "${tmp_file}" /etc/bashrc

diff --git a/snippets/tpl.225.vimrc-el7.sh b/snippets/tpl.225.vimrc-el7.sh
index dbcdd034b7d6a7c535a8e30f2fe284f0f921cb00..959c40d78ea0dd501c6e331b0f0b318a4161e98a 100644 (file)
--- a/snippets/tpl.225.vimrc-el7.sh
+++ b/snippets/tpl.225.vimrc-el7.sh
@@ -15,7 +15,7 @@ set_vimrc_el7() {
     log "Rewriting /etc/vimrc ..."
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/vimrc /etc/vimrc.original
         mv -v "${tmp_file}" /etc/vimrc

diff --git a/snippets/tpl.230.vimrc-el8.sh b/snippets/tpl.230.vimrc-el8.sh
index 1d100feb1f890b36cd59fe8ca1e447cd022ac6c7..7465739130cc9408c920fb0e1210597a4bbb8720 100644 (file)
--- a/snippets/tpl.230.vimrc-el8.sh
+++ b/snippets/tpl.230.vimrc-el8.sh
@@ -15,7 +15,7 @@ set_vimrc_centos8() {
     log "Rewriting /etc/vimrc ..."
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/vimrc /etc/vimrc.original
         mv -v "${tmp_file}" /etc/vimrc

diff --git a/snippets/tpl.231.vimrc-el9.sh b/snippets/tpl.231.vimrc-el9.sh
index a145bff616ec7d14178de470a24fd20ddf8f11ee..d2fedb93ab56774391de5da6cb1f5a56061c722a 100644 (file)
--- a/snippets/tpl.231.vimrc-el9.sh
+++ b/snippets/tpl.231.vimrc-el9.sh
@@ -15,7 +15,7 @@ set_vimrc_el9() {
     log "Writing /etc/vimrc.local ..."
 
     local tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         if [[ -f '/etc/vimrc.local' ]] ; then
             cp -p '/etc/vimrc.local' '/etc/vimrc.local.original'

diff --git a/snippets/tpl.300.create-motd.sh b/snippets/tpl.300.create-motd.sh
index 605bc29ad82c24176d01cbe8e2ff6777b28efe5f..8059281289336a17c661f54f021fc018f6580002 100644 (file)
--- a/snippets/tpl.300.create-motd.sh
+++ b/snippets/tpl.300.create-motd.sh
@@ -17,7 +17,7 @@ create_motd() {
     log "Creating initial /etc/motd ..."
 
     local mk_script=$( mktemp -p /tmp "mk_create_motd.XXXXXXXXXX.ksh" )
-    if wget -O "${mk_script}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+    if curl -s -S -o "${mk_script}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
         chmod 0755 "${mk_script}"
         "${mk_script}" > /etc/motd
         mkdir -pv /root/bin

diff --git a/snippets/tpl.470.postfix.sh b/snippets/tpl.470.postfix.sh
index d10f0da4bd72e7064308824b4c546ad185ebed29..bbbfa7240f2d1efac77bd3a0fa6c2436c0bb9bfa 100644 (file)
--- a/snippets/tpl.470.postfix.sh
+++ b/snippets/tpl.470.postfix.sh
@@ -156,7 +156,7 @@ install_postfix() {
     echo "Getting new master.cf ..."
     url="${cobbler_url}/${ws_rel_filesdir}/${system_status}/postfix/master.cf"
     tmp_file=$( mktemp )
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         mv -v "${tmp_file}" /etc/postfix/master.cf
     fi
@@ -165,7 +165,7 @@ install_postfix() {
     echo "Getting new virtuals ..."
     cp /dev/null "${tmp_file}"
     url="${cobbler_url}/${ws_rel_filesdir}/${system_status}/postfix/virtual"
-    wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         mv -v "${tmp_file}" /etc/postfix/virtual
     fi

diff --git a/snippets/tpl.500.logrotate.sh b/snippets/tpl.500.logrotate.sh
index 1d6af68bdcd197ba5a83b5866d4203a0689205bd..ef8eb6f62c942b82f3c029b805b0382f5007f0ae 100644 (file)
--- a/snippets/tpl.500.logrotate.sh
+++ b/snippets/tpl.500.logrotate.sh
@@ -21,7 +21,7 @@ config_logrotate() {
     local tgt="/etc/logrotate.conf"
 
     echo "Getting ${url} => ${tgt} ..."
-    if wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+    if curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'logrotate.conf' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -36,7 +36,7 @@ config_logrotate() {
         tgt="/etc/logrotate.d/${base}"
         cp -v /dev/null "${tmp_file}"
         echo "Getting ${url} => ${tgt} ..."
-        if wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${base}' from '${url}'." | tee -a "${ERROR_POINTER}"