From 137db72cdf1eac69ab6b4fa50bb9dc1b0f31bed2 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sun, 11 Oct 2015 02:38:07 +0200 Subject: [PATCH] Correcting options for running curl only on IPv4. --- roles/ansible-pull/templates/ansible-pull.sh | 4 ++-- roles/ansible-pull/templates/crontab | 2 +- roles/preseed/templates/preseed/client-trusty.seed | 2 +- roles/preseed/templates/preseed/docenti-trusty.seed | 2 +- roles/preseed/templates/preseed/postseed-client.sh | 6 +++--- roles/preseed/templates/preseed/postseed-docenti.sh | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/roles/ansible-pull/templates/ansible-pull.sh b/roles/ansible-pull/templates/ansible-pull.sh index d55edee..11bb422 100644 --- a/roles/ansible-pull/templates/ansible-pull.sh +++ b/roles/ansible-pull/templates/ansible-pull.sh @@ -2,7 +2,7 @@ # Aggiorna crontab e logrotate forzosamente. echo "$(date --rfc-3339=seconds) Loading and running init-ansible.sh" -/usr/bin/curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | /bin/bash +/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | /bin/bash # Script provvisorio. # Potremmo decidere di far eseguire uno script generato da servizio @@ -15,7 +15,7 @@ branch=master playbook=local.yml echo "$(date --rfc-3339=seconds) Getting vault password" -vaultpassfile=$(/usr/bin/curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/getvaultpass.py | /usr/bin/python) +vaultpassfile=$(/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/getvaultpass.py | /usr/bin/python) echo "$(date --rfc-3339=seconds) Running ansible-pull" /usr/bin/ansible-pull --accept-host-key -d "${repo}" -U "${url}" -C "${branch}" "${playbook}" --vault-password-file "${vaultpassfile}" $@ diff --git a/roles/ansible-pull/templates/crontab b/roles/ansible-pull/templates/crontab index de5598e..96dc241 100644 --- a/roles/ansible-pull/templates/crontab +++ b/roles/ansible-pull/templates/crontab @@ -1 +1 @@ -@reboot root /usr/bin/curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/ansible-pull.sh | /bin/bash >>/var/log/ansible-pull.log 2>&1 +@reboot root /usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/ansible-pull.sh | /bin/bash >>/var/log/ansible-pull.log 2>&1 diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed index 4a0d9cb..5fbcd3f 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -113,7 +113,7 @@ d-i preseed/late_command string in-target apt-get -y upgrade; \ in-target apt-get -y purge libnss-mdns unity-webapps-common zeitgeist-core zeitgeist-datahub epoptes; \ in-target apt-get -y autoremove; \ sed -i'' -e 's/ubuntu/gnome-fallback/g' /target/usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf; \ - in-target /bin/bash -c "curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-client.sh | /bin/bash >/root/postseed.log 2>&1"; + in-target /bin/bash -c "/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-client.sh | /bin/bash >/root/postseed.log 2>&1"; # Grub installation on MBR d-i grub-installer/only_debian boolean true diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed index 9d67ada..47f3238 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -113,7 +113,7 @@ d-i preseed/late_command string in-target apt-get -y upgrade; \ in-target apt-get -y purge libnss-mdns unity-webapps-common zeitgeist-core zeitgeist-datahub epoptes-client; \ in-target apt-get -y autoremove; \ sed -i'' -e 's/ubuntu/gnome-fallback/g' /target/usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf; \ - in-target bash -c "curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-docenti.sh | /bin/bash >/root/post-ks.log 2>&1"; + in-target bash -c "/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-docenti.sh | /bin/bash >/root/postseed.log 2>&1"; # Grub installation on MBR d-i grub-installer/only_debian boolean true diff --git a/roles/preseed/templates/preseed/postseed-client.sh b/roles/preseed/templates/preseed/postseed-client.sh index 38d6dd0..04e6f70 100644 --- a/roles/preseed/templates/preseed/postseed-client.sh +++ b/roles/preseed/templates/preseed/postseed-client.sh @@ -1,9 +1,9 @@ #!/bin/bash # Cambio username con quello fornito da servizio -TARGETHOSTNAME=$(wget -qO- http://{{ ansible_local.domain.serverfqdn }}:3000/whatsmyhostname) +TARGETHOSTNAME=$(/usr/bin/wget -qO- http://{{ ansible_local.domain.serverfqdn }}:3000/whatsmyhostname) echo $TARGETHOSTNAME > /etc/hostname -sed -i'' -e "s/kickseed/$TARGETHOSTNAME/g" /etc/hosts +/bin/sed -i'' -e "s/kickseed/$TARGETHOSTNAME/g" /etc/hosts # Installo i file necessari per ansible. -curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | bash +/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | /bin/bash diff --git a/roles/preseed/templates/preseed/postseed-docenti.sh b/roles/preseed/templates/preseed/postseed-docenti.sh index 03ad1b3..abd4b7d 100644 --- a/roles/preseed/templates/preseed/postseed-docenti.sh +++ b/roles/preseed/templates/preseed/postseed-docenti.sh @@ -1,9 +1,9 @@ #!/bin/bash # Cambio username con quello fornito da servizio -TARGETHOSTNAME=$(wget -qO- http://{{ ansible_local.domain.serverfqdn }}:3000/whatsmyhostname?role=docenti) +TARGETHOSTNAME=$(/usr/bin/wget -qO- http://{{ ansible_local.domain.serverfqdn }}:3000/whatsmyhostname?role=docenti) echo $TARGETHOSTNAME > /etc/hostname -sed -i'' -e "s/kickseed/$TARGETHOSTNAME/g" /etc/hosts +/bin/sed -i'' -e "s/kickseed/$TARGETHOSTNAME/g" /etc/hosts # Installo i file necessari per ansible. -curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | bash +/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | /bin/bash