From 02dd0eed95c66a6920a95e465c3ad997e896e2e5 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 24 Oct 2017 21:44:42 +0200 Subject: [PATCH] Issue #23: downloading the client repository by init-ansible.sh. --- roles/ansible-pull/templates/init-ansible.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/roles/ansible-pull/templates/init-ansible.sh b/roles/ansible-pull/templates/init-ansible.sh index 34b8e19..7f968fd 100644 --- a/roles/ansible-pull/templates/init-ansible.sh +++ b/roles/ansible-pull/templates/init-ansible.sh @@ -1,14 +1,26 @@ #!/bin/bash +# Fixing base variables. +basedir=/var/lib/{{ ansible_local.domain.domainfull }} +url=git://{{ ansible_local.domain.serverfqdn }}/client-pull-installation.git +branch={{ ansible_local.domain.client_gitbranch }} + # Creo directory dipendenti echo "$(date --rfc-3339=seconds) Installing bin directory." -/usr/bin/install -d -o root -g users /var/lib/{{ ansible_local.domain.domainfull }}/bin -/bin/chown -R root:users /var/lib/{{ ansible_local.domain.domainfull }} +/usr/bin/install -d -o root -g users ${basedir}/bin + +# Workaround issue #23 - ansible-pull won't pull out of remote the first time. +if [[ ! -f ${basedir}/config/local.yml ]]; then + /usr/bin/git clone -b ${branch} ${url} ${basedir}/config +fi # Installo ansible-pull.sh echo "$(date --rfc-3339=seconds) Creating ansible-pull.sh." -/usr/bin/wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/ansible-pull.sh -O /var/lib/{{ ansible_local.domain.domainfull }}/bin/ansible-pull.sh -chmod a+x /var/lib/{{ ansible_local.domain.domainfull }}/bin/ansible-pull.sh +/usr/bin/wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/ansible-pull.sh -O ${basedir}/bin/ansible-pull.sh +chmod a+x ${basedir}/bin/ansible-pull.sh + +# Fixing permissions on the main directory +/bin/chown -R root:users ${basedir} # Installo il cronjob per ansible-pull echo "$(date --rfc-3339=seconds) Creating crontab"