From 12b06745acd363fb32495961534639ee62dd1d7b Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sun, 11 Oct 2015 02:04:15 +0200 Subject: [PATCH] Correcting cleanup of libreoffice ppa within apt-mirror.list. Correcting scripts for ansible-pull to include paths for executables. --- roles/ansible-pull/templates/ansible-pull.sh | 6 +++--- roles/ansible-pull/templates/crontab | 2 +- roles/ansible-pull/templates/init-ansible.sh | 16 ++++++++-------- roles/ubuntu-mirror/files/apt-mirror.list | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/roles/ansible-pull/templates/ansible-pull.sh b/roles/ansible-pull/templates/ansible-pull.sh index 2546125..86c7f99 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 +/usr/bin/curl -sSL 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 @@ -13,7 +13,7 @@ logfile=/var/lib/ansible-pull.log branch=master playbook=local.yml -vaultpassfile=$(\curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/getvaultpass.py | python) +vaultpassfile=$(/usr/bin/curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/getvaultpass.py | /usr/bin/python) -ansible-pull --accept-host-key -d "${repo}" -U "${url}" -C "${branch}" "${playbook}" --vault-password-file "${vaultpassfile}" $@ +/usr/bin/ansible-pull --accept-host-key -d "${repo}" -U "${url}" -C "${branch}" "${playbook}" --vault-password-file "${vaultpassfile}" $@ rm -f "${vaultpassfile}" diff --git a/roles/ansible-pull/templates/crontab b/roles/ansible-pull/templates/crontab index 50dd929..de5598e 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 /usr/bin/curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/ansible-pull.sh | /bin/bash >>/var/log/ansible-pull.log 2>&1 diff --git a/roles/ansible-pull/templates/init-ansible.sh b/roles/ansible-pull/templates/init-ansible.sh index 79f94d5..abf119c 100644 --- a/roles/ansible-pull/templates/init-ansible.sh +++ b/roles/ansible-pull/templates/init-ansible.sh @@ -1,15 +1,15 @@ #!/bin/bash # Creo directory dipendenti -install -d -o root -g users /var/lib/{{ ansible_local.domain.domainfull }}/config -chown -R root:users /var/lib/{{ ansible_local.domain.domainfull }} +/usr/bin/install -d -o root -g users /var/lib/{{ ansible_local.domain.domainfull }}/config +/bin/chown -R root:users /var/lib/{{ ansible_local.domain.domainfull }} # Installo il cronjob per ansible-pull -wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/crontab -O /etc/cron.d/ansible-pull -chown root:root /etc/cron.d/ansible-pull -chmod 0644 /etc/cron.d/ansible-pull +/usr/bin/wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/crontab -O /etc/cron.d/ansible-pull +/bin/chown root:root /etc/cron.d/ansible-pull +/bin/chmod 0644 /etc/cron.d/ansible-pull # Installo il logrotate per ansible -wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/logrotate -O /etc/logrotate.d/ansible-pull -chown root:root /etc/logrotate.d/ansible-pull -chmod 0644 /etc/logrotate.d/ansible-pull +/usr/bin/wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/logrotate -O /etc/logrotate.d/ansible-pull +/bin/chown root:root /etc/logrotate.d/ansible-pull +/bin/chmod 0644 /etc/logrotate.d/ansible-pull diff --git a/roles/ubuntu-mirror/files/apt-mirror.list b/roles/ubuntu-mirror/files/apt-mirror.list index 5c02a75..e71cfd2 100644 --- a/roles/ubuntu-mirror/files/apt-mirror.list +++ b/roles/ubuntu-mirror/files/apt-mirror.list @@ -82,5 +82,5 @@ clean http://extras.ubuntu.com/ubuntu clean http://archive.canonical.com clean http://security.ubuntu.com/ubuntu clean http://ppa.launchpad.net/ansible/ansible/ubuntu -clean http://ppa.launchpad.net/libreoffice/ppa/ubuntu +clean http://ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu clean http://bglug.sys42.eu/ubuntu