From 6442b82b97f3e5ea5a61b739c4c2bdea6a98f2c0 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Fri, 2 Oct 2015 20:21:14 +0200 Subject: [PATCH] Removing wrong call to curl. --- roles/ansible-pull/templates/ansible-pull.sh | 2 +- 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/post-client-ks.sh | 2 +- roles/preseed/templates/preseed/post-docenti-ks.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/ansible-pull/templates/ansible-pull.sh b/roles/ansible-pull/templates/ansible-pull.sh index 212615a..2546125 100644 --- a/roles/ansible-pull/templates/ansible-pull.sh +++ b/roles/ansible-pull/templates/ansible-pull.sh @@ -1,7 +1,7 @@ #!/bin/bash # Aggiorna crontab e logrotate forzosamente. -\curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | bash +curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | bash # Script provvisorio. # Potremmo decidere di far eseguire uno script generato da servizio diff --git a/roles/ansible-pull/templates/crontab b/roles/ansible-pull/templates/crontab index 55e73d3..50dd929 100644 --- a/roles/ansible-pull/templates/crontab +++ b/roles/ansible-pull/templates/crontab @@ -1 +1 @@ -@reboot root \curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/ansible-pull.sh | bash >>/var/log/ansible-pull.log 2>&1 +@reboot root curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/ansible-pull.sh | 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 fad4c69..5d3110e 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -115,7 +115,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; \ in-target apt-get -y autoremove; \ in-target sed -i'' -e 's/ubuntu/gnome-fallback/g' /usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf \ - in-target \curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/post-client-ks.sh | bash >/root/post-ks.log 2>&1 + in-target curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/post-client-ks.sh | bash >/root/post-ks.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 bcc59ee..3558c03 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -115,7 +115,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; \ in-target apt-get -y autoremove; \ in-target sed -i'' -e 's/ubuntu/gnome-fallback/g' /usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf \ - in-target \curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/post-docenti-ks.sh | bash >/root/post-ks.log 2>&1 + in-target curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/post-docenti-ks.sh | bash >/root/post-ks.log 2>&1 # Grub installation on MBR d-i grub-installer/only_debian boolean true diff --git a/roles/preseed/templates/preseed/post-client-ks.sh b/roles/preseed/templates/preseed/post-client-ks.sh index 1b4d0a0..0a92946 100644 --- a/roles/preseed/templates/preseed/post-client-ks.sh +++ b/roles/preseed/templates/preseed/post-client-ks.sh @@ -6,4 +6,4 @@ echo $TARGETHOSTNAME > /etc/hostname sed -i "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 +curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | bash diff --git a/roles/preseed/templates/preseed/post-docenti-ks.sh b/roles/preseed/templates/preseed/post-docenti-ks.sh index 88d1a71..ff5a4b8 100644 --- a/roles/preseed/templates/preseed/post-docenti-ks.sh +++ b/roles/preseed/templates/preseed/post-docenti-ks.sh @@ -6,4 +6,4 @@ echo $TARGETHOSTNAME > /etc/hostname sed -i "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 +curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | bash