From 85783747a4cb7193f37e401aff1ff6ad50706ca7 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 3 Oct 2015 16:16:29 +0200 Subject: [PATCH] Correcting some errors in postseed scripts and init-ansible script. --- roles/ansible-pull/templates/init-ansible.sh | 7 ++++--- roles/preseed/tasks/preseed.yml | 4 ++-- roles/preseed/templates/preseed/client-trusty.seed | 4 ++-- roles/preseed/templates/preseed/docenti-trusty.seed | 4 ++-- .../preseed/{post-client-ks.sh => postseed-client.sh} | 2 +- .../preseed/{post-docenti-ks.sh => postseed-docenti.sh} | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) rename roles/preseed/templates/preseed/{post-client-ks.sh => postseed-client.sh} (85%) rename roles/preseed/templates/preseed/{post-docenti-ks.sh => postseed-docenti.sh} (86%) diff --git a/roles/ansible-pull/templates/init-ansible.sh b/roles/ansible-pull/templates/init-ansible.sh index 2d0c53e..3295ed9 100644 --- a/roles/ansible-pull/templates/init-ansible.sh +++ b/roles/ansible-pull/templates/init-ansible.sh @@ -1,14 +1,15 @@ #!/bin/bash # Creo directory dipendenti -install -d -o root -g locals /var/lib/{{ ansible_local.domain.domainfull }}/config +install -d -o root -g users /var/lib/{{ ansible_local.domain.domainfull }}/config +chmod -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:locals /etc/cron.d/ansible-pull +chown root:root /etc/cron.d/ansible-pull 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:locals /etc/logrotate.d/ansible-pull +chown root:root /etc/logrotate.d/ansible-pull chmod 0644 /etc/logrotate.d/ansible-pull diff --git a/roles/preseed/tasks/preseed.yml b/roles/preseed/tasks/preseed.yml index 77b5533..9a213d7 100644 --- a/roles/preseed/tasks/preseed.yml +++ b/roles/preseed/tasks/preseed.yml @@ -48,6 +48,6 @@ src: 'preseed/{{ item }}' dest: '/var/lib/nethserver/ibay/ks/preseed/{{ item }}' with_items: - - post-client-ks.sh - - post-docenti-ks.sh + - postseed-client.sh + - postseed-docenti.sh sudo: yes diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed index befcc45..28c9d24 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -112,8 +112,8 @@ d-i preseed/late_command string in-target apt-get -y upgrade; \ in-target apt-get -y dist-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 | in-target /bin/bash >/target/root/post-ks.log 2>&1 + sed -i'' -e 's/ubuntu/gnome-fallback/g' /target/usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf; \ + in-target "curl -sSL 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 77e112e..4d53e12 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -112,8 +112,8 @@ d-i preseed/late_command string in-target apt-get -y upgrade; \ in-target apt-get -y dist-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 + sed -i'' -e 's/ubuntu/gnome-fallback/g' /target/usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf; \ + in-target "curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-docenti.sh | /bin/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/postseed-client.sh similarity index 85% rename from roles/preseed/templates/preseed/post-client-ks.sh rename to roles/preseed/templates/preseed/postseed-client.sh index c50b9fc..fefc55a 100644 --- a/roles/preseed/templates/preseed/post-client-ks.sh +++ b/roles/preseed/templates/preseed/postseed-client.sh @@ -3,7 +3,7 @@ # Cambio username con quello fornito da servizio TARGETHOSTNAME=$(wget -qO- http://{{ ansible_local.domain.serverfqdn }}:3000/whatsmyhostname) echo $TARGETHOSTNAME > /etc/hostname -sed -i '' -e "s/kickseed/$TARGETHOSTNAME/g" /etc/hosts +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 | /bin/bash diff --git a/roles/preseed/templates/preseed/post-docenti-ks.sh b/roles/preseed/templates/preseed/postseed-docenti.sh similarity index 86% rename from roles/preseed/templates/preseed/post-docenti-ks.sh rename to roles/preseed/templates/preseed/postseed-docenti.sh index a290992..03ad1b3 100644 --- a/roles/preseed/templates/preseed/post-docenti-ks.sh +++ b/roles/preseed/templates/preseed/postseed-docenti.sh @@ -3,7 +3,7 @@ # Cambio username con quello fornito da servizio TARGETHOSTNAME=$(wget -qO- http://{{ ansible_local.domain.serverfqdn }}:3000/whatsmyhostname?role=docenti) echo $TARGETHOSTNAME > /etc/hostname -sed -i '' -e "s/kickseed/$TARGETHOSTNAME/g" /etc/hosts +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