From 034e483b96c928f38bd2bda328126d88059bb08d Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 19 Nov 2016 17:16:30 +0100 Subject: [PATCH 01/13] Fixing issue #5 by re-ordering meta informations between tasks. Minor aesthetic fixes. --- roles/client-install/meta/main.yml | 2 +- roles/preseed/meta/main.yml | 1 + roles/ubuntu-mirror/tasks/mirror-cfg.yml | 1 - roles/ubuntu-mirror/tasks/remote-mirror.yml | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/client-install/meta/main.yml b/roles/client-install/meta/main.yml index ca8d80c..6db33fe 100644 --- a/roles/client-install/meta/main.yml +++ b/roles/client-install/meta/main.yml @@ -1,8 +1,8 @@ --- dependencies: + - { role: ubuntu-mirror, tags: [ 'client-install' ] } - { role: preseed, tags: [ 'client-install' ] } - { role: ansible-pull, tags: [ 'client-install' ] } - - { role: ubuntu-mirror, tags: [ 'client-install' ] } - { role: doraemon, tags: [ 'client-install' ] } - { role: npm, tags: [ 'client-install' ] } - { role: git-daemon, tags: [ 'client-install' ] } diff --git a/roles/preseed/meta/main.yml b/roles/preseed/meta/main.yml index 7474eff..7de2c79 100644 --- a/roles/preseed/meta/main.yml +++ b/roles/preseed/meta/main.yml @@ -1,3 +1,4 @@ --- dependencies: - { role: pxe } + - { role: ubuntu-mirror } diff --git a/roles/ubuntu-mirror/tasks/mirror-cfg.yml b/roles/ubuntu-mirror/tasks/mirror-cfg.yml index e4924b8..a526b2f 100644 --- a/roles/ubuntu-mirror/tasks/mirror-cfg.yml +++ b/roles/ubuntu-mirror/tasks/mirror-cfg.yml @@ -16,4 +16,3 @@ - name: Determining mirror_security_path set_fact: spath="{{ ansible_local.domain.mirror_security_path }}" when: ansible_local.domain.mirror_security_path is defined - diff --git a/roles/ubuntu-mirror/tasks/remote-mirror.yml b/roles/ubuntu-mirror/tasks/remote-mirror.yml index 32eafa8..aa979f7 100644 --- a/roles/ubuntu-mirror/tasks/remote-mirror.yml +++ b/roles/ubuntu-mirror/tasks/remote-mirror.yml @@ -1,3 +1,2 @@ --- # Managing a remote mirror - Doing nothing ;) - From 16804ba2963cc3f9da0fc34a99cc770e7816db83 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 19 Nov 2016 17:43:11 +0100 Subject: [PATCH 02/13] Forcing interfaces to be configured fixing issue #7. --- roles/nethcfg/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/nethcfg/tasks/main.yml b/roles/nethcfg/tasks/main.yml index 2ed8eaa..e038d4e 100644 --- a/roles/nethcfg/tasks/main.yml +++ b/roles/nethcfg/tasks/main.yml @@ -3,7 +3,6 @@ # Network interfaces - include: network.yml - when: development|bool become: yes tags: - network From 664c93e509a68dfbd904cf2ee109500a15091d59 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 19 Nov 2016 17:57:11 +0100 Subject: [PATCH 03/13] Cleaning up preseed files. --- .../templates/preseed/client-trusty.seed | 16 ++++++++------ .../templates/preseed/dev/client-trusty.seed | 18 ++++++++------- .../templates/preseed/dev/docenti-trusty.seed | 18 ++++++++------- .../templates/preseed/docenti-trusty.seed | 22 ++++++++----------- roles/preseed/templates/preseed/edubuntu.seed | 14 ++++++------ roles/pxe/tasks/pxe.yml | 12 +++++----- 6 files changed, 51 insertions(+), 49 deletions(-) diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed index ff62c06..d94a2f8 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -25,18 +25,19 @@ d-i mirror/http/hostname string {{ mirror_host }} d-i mirror/http/directory string {{ mirror_path }} d-i mirror/http/proxy string d-i mirror/suite string trusty +d-i mirror/udeb/components multiselect main, restricted, universe, multiverse # Apt-setup additional repos -d-i apt-setup/extras boolean false -d-i apt-setup/restricted boolean true -d-i apt-setup/universe boolean true -d-i apt-setup/backports boolean true -d-i apt-setup/non-free boolean true -d-i apt-setup/contrib boolean true d-i apt-setup/services-select multiselect security, updates d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} +# Additional repos +d-i apt-setup/multiverse boolean true +d-i apt-setup/universe boolean true +d-i apt-setup/restricted boolean true +d-i apt-setup/partner boolean true + # Setup and enable libreoffice PPA d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA @@ -74,6 +75,7 @@ d-i user-setup/encrypt-home boolean false # Kernel installation d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta string lts-xenial # Install the Edubuntu desktop. tasksel tasksel/first multiselect edubuntu-desktop-gnome @@ -87,7 +89,7 @@ d-i localechooser/translation/warn-light boolean true # Policy to upgrade: none d-i pkgsel/update-policy select none -# UPgrade after installation: no +# Upgrade after installation: no d-i pkgsel/upgrade select none # Language pack selection diff --git a/roles/preseed/templates/preseed/dev/client-trusty.seed b/roles/preseed/templates/preseed/dev/client-trusty.seed index f291c12..13b9ff8 100644 --- a/roles/preseed/templates/preseed/dev/client-trusty.seed +++ b/roles/preseed/templates/preseed/dev/client-trusty.seed @@ -25,18 +25,19 @@ d-i mirror/http/hostname string {{ mirror_host }} d-i mirror/http/directory string {{ mirror_path }} d-i mirror/http/proxy string d-i mirror/suite string trusty +d-i mirror/udeb/components multiselect main, restricted, universe, multiverse # Apt-setup additional repos -d-i apt-setup/extras boolean false -d-i apt-setup/restricted boolean true -d-i apt-setup/universe boolean true -d-i apt-setup/backports boolean true -d-i apt-setup/non-free boolean true -d-i apt-setup/contrib boolean true d-i apt-setup/services-select multiselect security, updates d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} +# Additional repos +d-i apt-setup/multiverse boolean true +d-i apt-setup/universe boolean true +d-i apt-setup/restricted boolean true +d-i apt-setup/partner boolean true + # Setup and enable libreoffice PPA d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA @@ -56,7 +57,7 @@ d-i clock-setup/ntp-server string {{ ansible_local.domain.ntpserver }} # User creation d-i passwd/user-fullname string BgLUG User d-i passwd/username string bglug -d-i passwd/user-password-crypted string $1$33bB/LIt$MEHmvzVIgYRJs/5L4z34L/ +d-i passwd/user-password-crypted password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ # Partitioning d-i partman-auto/init_automatically_partition select biggest_free @@ -74,6 +75,7 @@ d-i user-setup/encrypt-home boolean false # Kernel installation d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta string lts-xenial # Install the Edubuntu desktop. tasksel tasksel/first multiselect edubuntu-desktop-gnome @@ -87,7 +89,7 @@ d-i localechooser/translation/warn-light boolean true # Policy to upgrade: none d-i pkgsel/update-policy select none -# UPgrade after installation: no +# Upgrade after installation: no d-i pkgsel/upgrade select none # Language pack selection diff --git a/roles/preseed/templates/preseed/dev/docenti-trusty.seed b/roles/preseed/templates/preseed/dev/docenti-trusty.seed index 9994106..b957912 100644 --- a/roles/preseed/templates/preseed/dev/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/dev/docenti-trusty.seed @@ -25,18 +25,19 @@ d-i mirror/http/hostname string {{ mirror_host }} d-i mirror/http/directory string {{ mirror_path }} d-i mirror/http/proxy string d-i mirror/suite string trusty +d-i mirror/udeb/components multiselect main, restricted, universe, multiverse # Apt-setup additional repos -d-i apt-setup/extras boolean false -d-i apt-setup/restricted boolean true -d-i apt-setup/universe boolean true -d-i apt-setup/backports boolean true -d-i apt-setup/non-free boolean true -d-i apt-setup/contrib boolean true d-i apt-setup/services-select multiselect security, updates d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} +# Additional repos +d-i apt-setup/multiverse boolean true +d-i apt-setup/universe boolean true +d-i apt-setup/restricted boolean true +d-i apt-setup/partner boolean true + # Setup and enable libreoffice PPA d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA @@ -56,7 +57,7 @@ d-i clock-setup/ntp-server string {{ ansible_local.domain.ntpserver }} # User creation d-i passwd/user-fullname string BgLUG User d-i passwd/username string bglug -d-i passwd/user-password-crypted string $1$33bB/LIt$MEHmvzVIgYRJs/5L4z34L/ +d-i passwd/user-password-crypted password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ # Partitioning d-i partman-auto/init_automatically_partition select biggest_free @@ -74,6 +75,7 @@ d-i user-setup/encrypt-home boolean false # Kernel installation d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta lts-xenial # Install the Edubuntu desktop. tasksel tasksel/first multiselect edubuntu-desktop-gnome @@ -87,7 +89,7 @@ d-i localechooser/translation/warn-light boolean true # Policy to upgrade: none d-i pkgsel/update-policy select none -# UPgrade after installation: no +# Upgrade after installation: no d-i pkgsel/upgrade select none # Language pack selection diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed index 482d03a..fd39432 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -16,27 +16,22 @@ d-i netcfg/choose_interface select auto d-i netcfg/hostname string kickseed # Enabling non-free firmware -d-i hw-detect/load_firmware boolean true - -# Setting up repositories from local mirror -d-i mirror/country string manual -d-i mirror/protocol string http -d-i mirror/http/hostname string {{ mirror_host }} d-i mirror/http/directory string {{ mirror_path }} d-i mirror/http/proxy string d-i mirror/suite string trusty +d-i mirror/udeb/components multiselect main, restricted, universe, multiverse # Apt-setup additional repos -d-i apt-setup/extras boolean false -d-i apt-setup/restricted boolean true -d-i apt-setup/universe boolean true -d-i apt-setup/backports boolean true -d-i apt-setup/non-free boolean true -d-i apt-setup/contrib boolean true d-i apt-setup/services-select multiselect security, updates d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} +# Additional repos +d-i apt-setup/multiverse boolean true +d-i apt-setup/universe boolean true +d-i apt-setup/restricted boolean true +d-i apt-setup/partner boolean true + # Setup and enable libreoffice PPA d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA @@ -74,6 +69,7 @@ d-i user-setup/encrypt-home boolean false # Kernel installation d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta string lts-xenial # Install the Edubuntu desktop. tasksel tasksel/first multiselect edubuntu-desktop-gnome @@ -87,7 +83,7 @@ d-i localechooser/translation/warn-light boolean true # Policy to upgrade: none d-i pkgsel/update-policy select none -# UPgrade after installation: no +# Upgrade after installation: no d-i pkgsel/upgrade select none # Language pack selection diff --git a/roles/preseed/templates/preseed/edubuntu.seed b/roles/preseed/templates/preseed/edubuntu.seed index c0dd76c..004d8cf 100644 --- a/roles/preseed/templates/preseed/edubuntu.seed +++ b/roles/preseed/templates/preseed/edubuntu.seed @@ -28,16 +28,15 @@ d-i mirror/http/proxy string d-i mirror/suite string trusty # Apt-setup additional repos -d-i apt-setup/extras boolean true -d-i apt-setup/restricted boolean true -d-i apt-setup/universe boolean true -d-i apt-setup/backports boolean true -d-i apt-setup/non-free boolean true -d-i apt-setup/contrib boolean true d-i apt-setup/services-select multiselect security, updates d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} +# Additional repos +d-i apt-setup/restricted boolean true +d-i apt-setup/universe boolean true +d-i apt-setup/multiverse boolean true + # Setup and enable libreoffice PPA d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA @@ -70,6 +69,7 @@ d-i user-setup/encrypt-home boolean false # Kernel installation d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta string lts-xenial # Install the Edubuntu desktop. tasksel tasksel/first multiselect edubuntu-desktop-gnome @@ -83,7 +83,7 @@ d-i localechooser/translation/warn-light boolean true # Policy to upgrade: none d-i pkgsel/update-policy select none -# UPgrade after installation: no +# Upgrade after installation: no d-i pkgsel/upgrade select none # Language pack selection diff --git a/roles/pxe/tasks/pxe.yml b/roles/pxe/tasks/pxe.yml index d907cb7..c4789a4 100644 --- a/roles/pxe/tasks/pxe.yml +++ b/roles/pxe/tasks/pxe.yml @@ -13,7 +13,7 @@ - name: pxelinux.0 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-i386/current/images/netboot/pxelinux.0" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-amd64/current/images/utopic-netboot/pxelinux.0" dest: /var/lib/tftpboot/pxelinux.0 - name: pxelinux.cfg/default @@ -35,7 +35,7 @@ - name: vesamenu.c32 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-i386/current/images/netboot/ubuntu-installer/i386/boot-screens/vesamenu.c32" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-i386/current/images/netboot/ubuntu-installer/i386/boot-screens/vesamenu.c32" dest: /var/lib/tftpboot/utils/vesamenu.c32 - name: chain.c32 @@ -45,22 +45,22 @@ - name: linux i386 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-i386/current/images/netboot/ubuntu-installer/i386/linux" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-i386/current/images/netboot/ubuntu-installer/i386/linux" dest: /var/lib/tftpboot/ubuntu/14.04/i386/linux - name: initrd.gz i386 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-i386/current/images/netboot/ubuntu-installer/i386/initrd.gz" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-i386/current/images/netboot/ubuntu-installer/i386/initrd.gz" dest: /var/lib/tftpboot/ubuntu/14.04/i386/initrd.gz - name: linux amd64 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/linux" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/linux" dest: /var/lib/tftpboot/ubuntu/14.04/amd64/linux - name: initrd.gz amd64 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/initrd.gz" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/initrd.gz" dest: /var/lib/tftpboot/ubuntu/14.04/amd64/initrd.gz - name: memdisk From 49d16a83ee17715eb103650cdd7c5e83c447c886 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 13 Sep 2016 01:51:07 +0200 Subject: [PATCH 04/13] Adding files for a new role: PCs for the classrooms. --- roles/preseed/tasks/preseed.yml | 2 + .../templates/preseed/aula-trusty.seed | 124 ++++++++++++++++++ .../templates/preseed/postseed-aula.sh | 9 ++ roles/pxe/templates/pxelinux.cfg/default | 22 ++++ 4 files changed, 157 insertions(+) create mode 100644 roles/preseed/templates/preseed/aula-trusty.seed create mode 100644 roles/preseed/templates/preseed/postseed-aula.sh diff --git a/roles/preseed/tasks/preseed.yml b/roles/preseed/tasks/preseed.yml index 276b30c..36a339e 100644 --- a/roles/preseed/tasks/preseed.yml +++ b/roles/preseed/tasks/preseed.yml @@ -47,6 +47,7 @@ - edubuntu.seed - client-trusty.seed - docenti-trusty.seed + - aula-trusty.seed become: yes - block: @@ -72,6 +73,7 @@ with_items: - postseed-client.sh - postseed-docenti.sh + - postseed-aula.sh - pulseaudio-perms.sh - checksum.fact become: yes diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed new file mode 100644 index 0000000..9db278d --- /dev/null +++ b/roles/preseed/templates/preseed/aula-trusty.seed @@ -0,0 +1,124 @@ +# No questions if possible +debconf debconf/priority string critical + +# Localization - Italiano +d-i debian-installer/locale string it_IT.UTF-8 +d-i debian-installer/supported-locales multiselect it_IT it_IT@euro en_US en_US.UTF-8 + +# Keyboard settings +d-i console-setup/ask_detect boolean false +d-i keyboard-configuration/layoutcode string it + +# Network +d-i netcfg/choose_interface select auto + +# Adjust the default hostname. +d-i netcfg/hostname string kickseed + +# Enabling non-free firmware +d-i hw-detect/load_firmware boolean true + +# Setting up repositories from local mirror +d-i mirror/country string manual +d-i mirror/protocol string http +d-i mirror/http/hostname string {{ mirror_host }} +d-i mirror/http/directory string {{ mirror_path }} +d-i mirror/http/proxy string +d-i mirror/suite string trusty + +# Apt-setup additional repos +d-i apt-setup/services-select multiselect security, updates +d-i apt-setup/security_host string {{ mirror_security_host }} +d-i apt-setup/security_path string {{ mirror_security_path }} + +# Additional repos +d-i apt-setup/multiverse boolean true +d-i apt-setup/universe boolean true +d-i apt-setup/restricted boolean true +d-i apt-setup/partner boolean true + +# Setup and enable libreoffice PPA +d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main +d-i apt-setup/local0/comment string LibreOffice Official PPA +d-i apt-setup/local0/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x36E81C9267FD1383FCC4490983FBA1751378B444&op=get + +# Setup and enable ansible PPA +d-i apt-setup/local1/repository string http://{{ execpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main +d-i apt-setup/local1/comment string Ansible Official PPA +d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get + +# Time and date +d-i clock-setup/utc boolean true +d-i time/zone string Europe/Rome +d-i clock-setup/ntp boolean true +d-i clock-setup/ntp-server string {{ ansible_local.domain.ntpserver }} + +# User creation +d-i passwd/user-fullname string BgLUG User +d-i passwd/username string bglug +d-i passwd/user-password-crypted password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ + +# Partitioning +d-i partman-auto/init_automatically_partition select biggest_free +d-i partman-auto/disk string /dev/sda +d-i partman-auto/method string regular +d-i partman-lvm/device_remove_lvm boolean true +d-i partman-md/device_remove_md boolean true +d-i partman-auto/choose_recipe select atomic +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/mount_style select uuid +d-i user-setup/encrypt-home boolean false + +# Kernel installation +d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta string lts-xenial + +# Install the Edubuntu desktop. +tasksel tasksel/first multiselect edubuntu-desktop-gnome + +# No asking for installation in language +d-i pkgsel/install-language-support boolean true +d-i pkgsel/ignore-incomplete-language-support boolean true +d-i localechooser/translation/warn-severe boolean true +d-i localechooser/translation/warn-light boolean true + +# Policy to upgrade: none +d-i pkgsel/update-policy select none + +# UPgrade after installation: no +d-i pkgsel/upgrade select none + +# Language pack selection +d-i pkgsel/language-packs multiselect it, en + +# Disable popularity contest +popularity-contest popularity-contest/participate boolean false + +# Install both GNOME and KDE translation packages. +d-i pkgsel/language-pack-patterns string language-pack-gnome-$LL language-pack-kde-$LL kde-i18n-$LL libreoffice-help-$LL libreoffice-l10n-$LL firefox-locale-$LL gimp-help-$LL thunderbird-locale-$LL + +# Adding libreoffice and ansible +{% if ansible_bios_version == 'VirtualBox' %} +d-i pkgsel/include string dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude virtualbox-guest-dkms +{% else %} +d-i pkgsel/include string dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude +{% endif %} + +# Post installation tasks +# Update system +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 unity-webapps-common zeitgeist-core zeitgeist-datahub epoptes 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 "/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-aula.sh | /bin/bash >/root/postseed.log 2>&1"; + +# Grub installation on MBR +d-i grub-installer/only_debian boolean true +d-i grub-installer/bootdev string /dev/sda + +# No reboot message +d-i finish-install/reboot_in_progress note diff --git a/roles/preseed/templates/preseed/postseed-aula.sh b/roles/preseed/templates/preseed/postseed-aula.sh new file mode 100644 index 0000000..ee6edb9 --- /dev/null +++ b/roles/preseed/templates/preseed/postseed-aula.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# Cambio username con quello fornito da servizio +TARGETHOSTNAME=$(/usr/bin/wget -qO- http://{{ ansible_local.domain.serverfqdn }}:3000/whatsmyhostname?role=aula) +echo $TARGETHOSTNAME > /etc/hostname +/bin/sed -i'' -e "s/kickseed/$TARGETHOSTNAME/g" /etc/hosts + +# Installo i file necessari per ansible. +/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/init-ansible.sh | /bin/bash diff --git a/roles/pxe/templates/pxelinux.cfg/default b/roles/pxe/templates/pxelinux.cfg/default index 80f16ce..f308b0d 100644 --- a/roles/pxe/templates/pxelinux.cfg/default +++ b/roles/pxe/templates/pxelinux.cfg/default @@ -56,6 +56,28 @@ LABEL return-docenti MENU EXIT MENU END +MENU BEGIN +MENU TITLE Installa nuova macchina AULA + +LABEL aula-32bit + MENU LABEL ^32 bit + LINUX /ubuntu/14.04/i386/linux + INITRD /ubuntu/14.04/i386/initrd.gz + APPEND vga=normal auto=true hostname=kickseed url=http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/aula-trusty.seed -- quiet + +LABEL aula-64bit + MENU LABEL ^64 bit + LINUX /ubuntu/14.04/amd64/linux + INITRD /ubuntu/14.04/amd64/initrd.gz + APPEND vga=normal auto=true hostname=kickseed url=http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/aula-trusty.seed -- quiet + +MENU SEPARATOR + +LABEL return-aula + MENU LABEL ^Torna al menu principale + MENU EXIT +MENU END + MENU SEPARATOR MENU BEGIN From df515691a38a976c72f8f1f5176573c8ef5ebc7b Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Thu, 12 Jan 2017 23:33:48 +0100 Subject: [PATCH 05/13] Fix for issue #10. --- roles/nethcfg/tasks/samba.yml | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/roles/nethcfg/tasks/samba.yml b/roles/nethcfg/tasks/samba.yml index 04a356f..d65df87 100644 --- a/roles/nethcfg/tasks/samba.yml +++ b/roles/nethcfg/tasks/samba.yml @@ -19,15 +19,35 @@ changed_when: "'RoamingProfiles=yes' not in chk_smb.stdout" ignore_errors: true +- name: "Create directory structure for templates-custom" + file: + path: "{{ item }}" + owner: root + group: root + mode: 0755 + state: directory + with_items: + - /etc/e-smith/templates-custom/etc/samba/smb.conf + - /etc/e-smith/templates-custom/etc/samba/smb.conf + +- name: "Copying settings from default." + copy: + src: /etc/e-smith/templates/etc/samba/smb.conf/10global + dest: /etc/e-smith/templates-custom/etc/samba/smb.conf/10global + remote_src: true + owner: root + group: root + mode: 0644 + - name: "Enabling unix extensions on SAMBA" replace: - dest: /etc/e-smith/templates/etc/samba/smb.conf/10global + dest: /etc/e-smith/templates-custom/etc/samba/smb.conf/10global regexp: '^unix extensions = no$' replace: 'unix extensions = yes' - name: Adding server signing as mandatory lineinfile: - dest: /etc/e-smith/templates/etc/samba/smb.conf/10global + dest: /etc/e-smith/templates-custom/etc/samba/smb.conf/10global line: "server signing = mandatory" insertafter: "^workgroup = " state: present @@ -59,12 +79,12 @@ register: chk_shared - name: Copying default templates for shared template type - shell: cp -r /etc/e-smith/templates/etc/samba/smb.conf/ibay-default /etc/e-smith/templates/etc/samba/smb.conf/ibay-shared + shell: cp -r /etc/e-smith/templates/etc/samba/smb.conf/ibay-default /etc/e-smith/templates-custom/etc/samba/smb.conf/ibay-shared when: force_ibay_shared|bool or chk_shared|failed - name: Configuring ibay-shared template structure (directory mask) lineinfile: - dest: /etc/e-smith/templates/etc/samba/smb.conf/ibay-shared/20profile_default + dest: /etc/e-smith/templates-custom/etc/samba/smb.conf/ibay-shared/20profile_default line: 'directory mask = 0775' insertafter: '^create mask' state: present @@ -72,7 +92,7 @@ - name: Configuring force create mode lineinfile: - dest: /etc/e-smith/templates/etc/samba/smb.conf/ibay-shared/20profile_default + dest: /etc/e-smith/templates-custom/etc/samba/smb.conf/ibay-shared/20profile_default line: 'force create mode = 0664' insertafter: '^directory mask' state: present @@ -80,7 +100,7 @@ - name: Configuring force directory mode lineinfile: - dest: /etc/e-smith/templates/etc/samba/smb.conf/ibay-shared/20profile_default + dest: /etc/e-smith/templates-custom/etc/samba/smb.conf/ibay-shared/20profile_default line: 'force directory mode = 0775' insertafter: '^force create mode' state: present From 5a6c50a870fc10b72dc9da3f7c569b704c3a3b2b Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 17 Jan 2017 22:53:43 +0100 Subject: [PATCH 06/13] Much more idempotenced fixes for issue 10. --- roles/nethcfg/tasks/samba.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/roles/nethcfg/tasks/samba.yml b/roles/nethcfg/tasks/samba.yml index d65df87..76ae397 100644 --- a/roles/nethcfg/tasks/samba.yml +++ b/roles/nethcfg/tasks/samba.yml @@ -13,22 +13,20 @@ # SAMBA -- name: Checking SMB configuration - shell: /sbin/e-smith/db configuration printprop smb RoamingProfiles - register: chk_smb - changed_when: "'RoamingProfiles=yes' not in chk_smb.stdout" +- name: "Verifying modifications on templates-custom." + shell: grep -q 'server signing = mandatory' /etc/e-smith/templates-custom/etc/templates-custom/etc/samba/smb.conf/10global + register: check_tempcust + changed_when: check_tempcust.rc != 0 ignore_errors: true - name: "Create directory structure for templates-custom" file: - path: "{{ item }}" + path: "/etc/e-smith/templates-custom/etc/samba/smb.conf" owner: root group: root mode: 0755 state: directory - with_items: - - /etc/e-smith/templates-custom/etc/samba/smb.conf - - /etc/e-smith/templates-custom/etc/samba/smb.conf + when: check_tempcust|changed - name: "Copying settings from default." copy: @@ -38,12 +36,14 @@ owner: root group: root mode: 0644 + when: check_tempcust|changed - name: "Enabling unix extensions on SAMBA" replace: dest: /etc/e-smith/templates-custom/etc/samba/smb.conf/10global regexp: '^unix extensions = no$' replace: 'unix extensions = yes' + when: check_tempcust|changed - name: Adding server signing as mandatory lineinfile: @@ -51,6 +51,13 @@ line: "server signing = mandatory" insertafter: "^workgroup = " state: present + when: check_tempcust|changed + +- name: Checking SMB configuration + shell: /sbin/e-smith/db configuration printprop smb RoamingProfiles + register: chk_smb + changed_when: "'RoamingProfiles=yes' not in chk_smb.stdout" + ignore_errors: true - name: Configuring SMB shell: /sbin/e-smith/db configuration setprop smb RoamingProfiles yes ServerRole PDC Workgroup "{{ ansible_local.domain.domainshort }}" status enabled @@ -120,10 +127,15 @@ become: yes when: force_ibay_shared|bool or chk_shared|failed +- name: Saving new version of smb.conf + shell: /sbin/e-smith/signal-event nethserver-samba-save + become: yes + when: check_tempcust|changed + - name: Forcing regeneration of smb.conf shell: /sbin/e-smith/signal-event nethserver-samba-update become: yes - when: force_ibay_shared|bool or chk_shared|failed + when: force_ibay_shared|bool or chk_shared|failed or check_tempcust|changed # Fixing issue #3 - Configure sudo access for admin on server for operator # access From 198c00dc54e8fc70087c57cfe791e53509e0288e Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 17 Jan 2017 23:00:01 +0100 Subject: [PATCH 07/13] Small fix in the control code for the templates-custom check. --- roles/nethcfg/tasks/samba.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nethcfg/tasks/samba.yml b/roles/nethcfg/tasks/samba.yml index 76ae397..3ec33b1 100644 --- a/roles/nethcfg/tasks/samba.yml +++ b/roles/nethcfg/tasks/samba.yml @@ -14,7 +14,7 @@ # SAMBA - name: "Verifying modifications on templates-custom." - shell: grep -q 'server signing = mandatory' /etc/e-smith/templates-custom/etc/templates-custom/etc/samba/smb.conf/10global + shell: grep -q 'server signing = mandatory' /etc/e-smith/templates-custom/etc/samba/smb.conf/10global register: check_tempcust changed_when: check_tempcust.rc != 0 ignore_errors: true From f0f241321451fb502bc377352ca038906f956913 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sun, 22 Jan 2017 22:36:30 +0100 Subject: [PATCH 08/13] Fixing errors within preseed files. Partially fixing issue #2. --- roles/preseed/templates/preseed/aula-trusty.seed | 10 +++++----- roles/preseed/templates/preseed/client-trusty.seed | 7 +++---- roles/preseed/templates/preseed/docenti-trusty.seed | 13 +++++++++---- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed index 9db278d..c9fb228 100644 --- a/roles/preseed/templates/preseed/aula-trusty.seed +++ b/roles/preseed/templates/preseed/aula-trusty.seed @@ -32,7 +32,7 @@ d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} # Additional repos -d-i apt-setup/multiverse boolean true +d-i apt-setup/multiverse boolean true d-i apt-setup/universe boolean true d-i apt-setup/restricted boolean true d-i apt-setup/partner boolean true @@ -88,7 +88,7 @@ d-i localechooser/translation/warn-light boolean true # Policy to upgrade: none d-i pkgsel/update-policy select none -# UPgrade after installation: no +# Upgrade after installation: no d-i pkgsel/upgrade select none # Language pack selection @@ -102,16 +102,16 @@ d-i pkgsel/language-pack-patterns string language-pack-gnome-$LL language-pack- # Adding libreoffice and ansible {% if ansible_bios_version == 'VirtualBox' %} -d-i pkgsel/include string dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude virtualbox-guest-dkms +d-i pkgsel/include string dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen virtualbox-guest-dkms {% else %} -d-i pkgsel/include string dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude +d-i pkgsel/include string dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen {% endif %} # Post installation tasks # Update system 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 unity-webapps-common zeitgeist-core zeitgeist-datahub epoptes epoptes-client; \ + in-target apt-get -y purge unity-webapps-common zeitgeist-core zeitgeist-datahub webbrowser-app epoptes 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 "/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-aula.sh | /bin/bash >/root/postseed.log 2>&1"; diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed index d94a2f8..05ca3d8 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -25,7 +25,6 @@ d-i mirror/http/hostname string {{ mirror_host }} d-i mirror/http/directory string {{ mirror_path }} d-i mirror/http/proxy string d-i mirror/suite string trusty -d-i mirror/udeb/components multiselect main, restricted, universe, multiverse # Apt-setup additional repos d-i apt-setup/services-select multiselect security, updates @@ -103,16 +102,16 @@ d-i pkgsel/language-pack-patterns string language-pack-gnome-$LL language-pack- # Adding libreoffice and ansible {% if ansible_bios_version == 'VirtualBox' %} -d-i pkgsel/include string epoptes-client dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude virtualbox-guest-dkms +d-i pkgsel/include string epoptes-client dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen virtualbox-guest-dkms {% else %} -d-i pkgsel/include string epoptes-client dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude +d-i pkgsel/include string epoptes-client dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen {% endif %} # Post installation tasks # Update system 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 unity-webapps-common zeitgeist-core zeitgeist-datahub epoptes; \ + in-target apt-get -y purge unity-webapps-common zeitgeist-core zeitgeist-datahub webbrowser-app 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 "/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-client.sh | /bin/bash >/root/postseed.log 2>&1"; diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed index fd39432..6c3175c 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -16,10 +16,15 @@ d-i netcfg/choose_interface select auto d-i netcfg/hostname string kickseed # Enabling non-free firmware +d-i hw-detect/load_firmware boolean true + +# Setting up repositories from local mirror +d-i mirror/country string manual +d-i mirror/protocol string http +d-i mirror/http/hostname string {{ mirror_host }} d-i mirror/http/directory string {{ mirror_path }} d-i mirror/http/proxy string d-i mirror/suite string trusty -d-i mirror/udeb/components multiselect main, restricted, universe, multiverse # Apt-setup additional repos d-i apt-setup/services-select multiselect security, updates @@ -97,16 +102,16 @@ d-i pkgsel/language-pack-patterns string language-pack-gnome-$LL language-pack- # Adding libreoffice and ansible {% if ansible_bios_version == 'VirtualBox' %} -d-i pkgsel/include string epoptes dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude virtualbox-guest-dkms +d-i pkgsel/include string epoptes dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen virtualbox-guest-dkms {% else %} -d-i pkgsel/include string epoptes dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude +d-i pkgsel/include string epoptes dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen {% endif %} # Post installation tasks # Update system 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 unity-webapps-common zeitgeist-core zeitgeist-datahub epoptes-client; \ + in-target apt-get -y purge unity-webapps-common zeitgeist-core zeitgeist-datahub webbrowser-app 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 "/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-docenti.sh | /bin/bash >/root/postseed.log 2>&1"; From 86ba9cfc72b35ba09f49a956e7d4c45f58591ffd Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Thu, 9 Feb 2017 22:50:17 +0100 Subject: [PATCH 09/13] Adding an additional repository to the batch: geogebra, for geogebra 5. --- roles/preseed/tasks/repoconfig.yml | 1 + roles/preseed/templates/preseed/aula-trusty.seed | 5 +++++ roles/preseed/templates/preseed/client-trusty.seed | 5 +++++ roles/preseed/templates/preseed/dev/client-trusty.seed | 5 +++++ roles/preseed/templates/preseed/dev/docenti-trusty.seed | 5 +++++ roles/preseed/templates/preseed/docenti-trusty.seed | 5 +++++ roles/preseed/templates/repoconfig/geogebra-stable.list | 1 + 7 files changed, 27 insertions(+) create mode 100644 roles/preseed/templates/repoconfig/geogebra-stable.list diff --git a/roles/preseed/tasks/repoconfig.yml b/roles/preseed/tasks/repoconfig.yml index 838d75b..a21e7d7 100644 --- a/roles/preseed/tasks/repoconfig.yml +++ b/roles/preseed/tasks/repoconfig.yml @@ -32,4 +32,5 @@ - bglug-trusty.list - ansible-ansible-trusty.list - libreoffice-ppa-trusty.list + - geogebra-stable.list become: yes diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed index c9fb228..4fecf62 100644 --- a/roles/preseed/templates/preseed/aula-trusty.seed +++ b/roles/preseed/templates/preseed/aula-trusty.seed @@ -47,6 +47,11 @@ d-i apt-setup/local1/repository string http://{{ execpath }}ppa.launchpad.net/a d-i apt-setup/local1/comment string Ansible Official PPA d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get +# Setup and enable geogebra repository +d-i apt-setup/local2/repository string http://{{ execpath }}/www.geogebra.net/linux stable main +d-i apt-setup/local2/comment string Geogebra Official repository +d-i apt-setup/local2/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new + # Time and date d-i clock-setup/utc boolean true d-i time/zone string Europe/Rome diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed index 05ca3d8..8d78c90 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -47,6 +47,11 @@ d-i apt-setup/local1/repository string http://{{ execpath }}ppa.launchpad.net/a d-i apt-setup/local1/comment string Ansible Official PPA d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get +# Setup and enable geogebra repository +d-i apt-setup/local2/repository string http://{{ execpath }}/www.geogebra.net/linux stable main +d-i apt-setup/local2/comment string Geogebra Official repository +d-i apt-setup/local2/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new + # Time and date d-i clock-setup/utc boolean true d-i time/zone string Europe/Rome diff --git a/roles/preseed/templates/preseed/dev/client-trusty.seed b/roles/preseed/templates/preseed/dev/client-trusty.seed index 13b9ff8..ae50a40 100644 --- a/roles/preseed/templates/preseed/dev/client-trusty.seed +++ b/roles/preseed/templates/preseed/dev/client-trusty.seed @@ -48,6 +48,11 @@ d-i apt-setup/local1/repository string http://{{ execpath }}ppa.launchpad.net/a d-i apt-setup/local1/comment string Ansible Official PPA d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get +# Setup and enable geogebra repository +d-i apt-setup/local2/repository string http://{{ execpath }}/www.geogebra.net/linux stable main +d-i apt-setup/local2/comment string Geogebra Official repository +d-i apt-setup/local2/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new + # Time and date d-i clock-setup/utc boolean true d-i time/zone string Europe/Rome diff --git a/roles/preseed/templates/preseed/dev/docenti-trusty.seed b/roles/preseed/templates/preseed/dev/docenti-trusty.seed index b957912..c9ea221 100644 --- a/roles/preseed/templates/preseed/dev/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/dev/docenti-trusty.seed @@ -48,6 +48,11 @@ d-i apt-setup/local1/repository string http://{{ execpath }}ppa.launchpad.net/a d-i apt-setup/local1/comment string Ansible Official PPA d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get +# Setup and enable geogebra repository +d-i apt-setup/local2/repository string http://{{ execpath }}/www.geogebra.net/linux stable main +d-i apt-setup/local2/comment string Geogebra Official repository +d-i apt-setup/local2/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new + # Time and date d-i clock-setup/utc boolean true d-i time/zone string Europe/Rome diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed index 6c3175c..daa3d20 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -47,6 +47,11 @@ d-i apt-setup/local1/repository string http://{{ execpath }}ppa.launchpad.net/a d-i apt-setup/local1/comment string Ansible Official PPA d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get +# Setup and enable geogebra repository +d-i apt-setup/local2/repository string http://{{ execpath }}/www.geogebra.net/linux stable main +d-i apt-setup/local2/comment string Geogebra Official repository +d-i apt-setup/local2/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new + # Time and date d-i clock-setup/utc boolean true d-i time/zone string Europe/Rome diff --git a/roles/preseed/templates/repoconfig/geogebra-stable.list b/roles/preseed/templates/repoconfig/geogebra-stable.list new file mode 100644 index 0000000..640d7cb --- /dev/null +++ b/roles/preseed/templates/repoconfig/geogebra-stable.list @@ -0,0 +1 @@ +deb http://{{ execpath }}www.geogebra.net/linux stable main From ba9ebf6d2926083f292c73535af63d503de74a9b Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Mon, 20 Feb 2017 23:22:53 +0100 Subject: [PATCH 10/13] Adding repository to apt-mirror.list. (#14) --- roles/ubuntu-mirror/templates/apt-mirror.list | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/ubuntu-mirror/templates/apt-mirror.list b/roles/ubuntu-mirror/templates/apt-mirror.list index acc0daf..61c03d0 100644 --- a/roles/ubuntu-mirror/templates/apt-mirror.list +++ b/roles/ubuntu-mirror/templates/apt-mirror.list @@ -67,6 +67,11 @@ deb-i386 http://ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main deb-amd64 http://ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main +# Geogebra Official repository +deb-i386 http://www.geogebra.net/linux stable main +deb-amd64 http://www.geogebra.net/linux stable main +deb-src http://www.geogebra.net/linux stable main + # BgLUG deb-i386 http://repo.bglug.it/ubuntu trusty main deb-amd64 http://repo.bglug.it/ubuntu trusty main @@ -78,4 +83,5 @@ clean http://archive.canonical.com clean http://{{ shost }}{{ spath }} clean http://ppa.launchpad.net/ansible/ansible/ubuntu clean http://ppa.launchpad.net/libreoffice/ppa/ubuntu +clean http://www.geogebra.net/linux clean http://repo.bglug.it/ubuntu From ddeeacdc613798a805a8ab57d7e49e161c7a4177 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Mon, 20 Feb 2017 23:27:23 +0100 Subject: [PATCH 11/13] Changes to integrate Epoptes stable PPA within clients. (#15) --- roles/preseed/tasks/repoconfig.yml | 1 + roles/preseed/templates/preseed/aula-trusty.seed | 11 ++++++++--- roles/preseed/templates/preseed/client-trusty.seed | 11 ++++++++--- roles/preseed/templates/preseed/docenti-trusty.seed | 11 ++++++++--- .../templates/repoconfig/epoptes-ppa-trusty.list | 2 ++ roles/ubuntu-mirror/templates/apt-mirror.list | 6 ++++++ 6 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 roles/preseed/templates/repoconfig/epoptes-ppa-trusty.list diff --git a/roles/preseed/tasks/repoconfig.yml b/roles/preseed/tasks/repoconfig.yml index a21e7d7..3fcad32 100644 --- a/roles/preseed/tasks/repoconfig.yml +++ b/roles/preseed/tasks/repoconfig.yml @@ -32,5 +32,6 @@ - bglug-trusty.list - ansible-ansible-trusty.list - libreoffice-ppa-trusty.list + - epoptes-ppa-trusty.list - geogebra-stable.list become: yes diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed index 4fecf62..0cffe82 100644 --- a/roles/preseed/templates/preseed/aula-trusty.seed +++ b/roles/preseed/templates/preseed/aula-trusty.seed @@ -47,10 +47,15 @@ d-i apt-setup/local1/repository string http://{{ execpath }}ppa.launchpad.net/a d-i apt-setup/local1/comment string Ansible Official PPA d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get +# Setup and enable epoptes PPA +d-i apt-setup/local2/repository string http://{{ execpath }}ppa.launchpad.net/epoptes/ppa/ubuntu trusty main +d-i apt-setup/local2/comment string Epoptes stable repository +d-i apt-setup/local2/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x2D9B9274D3DF9D7CD7281A3E49F26CB30350B375&op=get + # Setup and enable geogebra repository -d-i apt-setup/local2/repository string http://{{ execpath }}/www.geogebra.net/linux stable main -d-i apt-setup/local2/comment string Geogebra Official repository -d-i apt-setup/local2/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new +d-i apt-setup/local3/repository string http://{{ execpath }}/www.geogebra.net/linux stable main +d-i apt-setup/local3/comment string Geogebra Official repository +d-i apt-setup/local3/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new # Time and date d-i clock-setup/utc boolean true diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed index 8d78c90..e6341b9 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -47,10 +47,15 @@ d-i apt-setup/local1/repository string http://{{ execpath }}ppa.launchpad.net/a d-i apt-setup/local1/comment string Ansible Official PPA d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get +# Setup and enable epoptes PPA +d-i apt-setup/local2/repository string http://{{ execpath }}ppa.launchpad.net/epoptes/ppa/ubuntu trusty main +d-i apt-setup/local2/comment string Epoptes stable repository +d-i apt-setup/local2/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x2D9B9274D3DF9D7CD7281A3E49F26CB30350B375&op=get + # Setup and enable geogebra repository -d-i apt-setup/local2/repository string http://{{ execpath }}/www.geogebra.net/linux stable main -d-i apt-setup/local2/comment string Geogebra Official repository -d-i apt-setup/local2/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new +d-i apt-setup/local3/repository string http://{{ execpath }}/www.geogebra.net/linux stable main +d-i apt-setup/local3/comment string Geogebra Official repository +d-i apt-setup/local3/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new # Time and date d-i clock-setup/utc boolean true diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed index daa3d20..37f0967 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -47,10 +47,15 @@ d-i apt-setup/local1/repository string http://{{ execpath }}ppa.launchpad.net/a d-i apt-setup/local1/comment string Ansible Official PPA d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get +# Setup and enable epoptes PPA +d-i apt-setup/local2/repository string http://{{ execpath }}ppa.launchpad.net/epoptes/ppa/ubuntu trusty main +d-i apt-setup/local2/comment string Epoptes stable repository +d-i apt-setup/local2/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x2D9B9274D3DF9D7CD7281A3E49F26CB30350B375&op=get + # Setup and enable geogebra repository -d-i apt-setup/local2/repository string http://{{ execpath }}/www.geogebra.net/linux stable main -d-i apt-setup/local2/comment string Geogebra Official repository -d-i apt-setup/local2/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new +d-i apt-setup/local3/repository string http://{{ execpath }}/www.geogebra.net/linux stable main +d-i apt-setup/local3/comment string Geogebra Official repository +d-i apt-setup/local3/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new # Time and date d-i clock-setup/utc boolean true diff --git a/roles/preseed/templates/repoconfig/epoptes-ppa-trusty.list b/roles/preseed/templates/repoconfig/epoptes-ppa-trusty.list new file mode 100644 index 0000000..c997fe3 --- /dev/null +++ b/roles/preseed/templates/repoconfig/epoptes-ppa-trusty.list @@ -0,0 +1,2 @@ +deb http://{{ execpath }}ppa.launchpad.net/epoptes/ppa/ubuntu trusty main +#deb-src http://{{ execpath }}ppa.launchpad.net/epoptes/ppa/ubuntu trusty main diff --git a/roles/ubuntu-mirror/templates/apt-mirror.list b/roles/ubuntu-mirror/templates/apt-mirror.list index 61c03d0..9296985 100644 --- a/roles/ubuntu-mirror/templates/apt-mirror.list +++ b/roles/ubuntu-mirror/templates/apt-mirror.list @@ -67,6 +67,11 @@ deb-i386 http://ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main deb-amd64 http://ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main +# Epoptes stable +deb-i386 http://ppa.launchpad.net/epoptes/ppa/ubuntu trusty main +deb-amd64 http://ppa.launchpad.net/epoptes/ppa/ubuntu trusty main +deb-src http://ppa.launchpad.net/epoptes/ppa/ubuntu trusty main + # Geogebra Official repository deb-i386 http://www.geogebra.net/linux stable main deb-amd64 http://www.geogebra.net/linux stable main @@ -83,5 +88,6 @@ clean http://archive.canonical.com clean http://{{ shost }}{{ spath }} clean http://ppa.launchpad.net/ansible/ansible/ubuntu clean http://ppa.launchpad.net/libreoffice/ppa/ubuntu +clean http://ppa.launchpad.net/epoptes/ppa/ubuntu clean http://www.geogebra.net/linux clean http://repo.bglug.it/ubuntu From 925a8fd63b5543a73c14c57aa091daf8fd9604a0 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 21 Feb 2017 22:26:13 +0100 Subject: [PATCH 12/13] Removing unneeded dependency. --- roles/preseed/meta/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/preseed/meta/main.yml b/roles/preseed/meta/main.yml index 7de2c79..7474eff 100644 --- a/roles/preseed/meta/main.yml +++ b/roles/preseed/meta/main.yml @@ -1,4 +1,3 @@ --- dependencies: - { role: pxe } - - { role: ubuntu-mirror } From f2556c7fdfea655565970df9429b1f3fcf7378c4 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 21 Feb 2017 23:00:58 +0100 Subject: [PATCH 13/13] Adding aesthetic fixes. --- roles/nethcfg/tasks/samba.yml | 2 +- roles/preseed/templates/preseed/aula-trusty.seed | 2 +- roles/pxe/templates/pxelinux.cfg/default | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/nethcfg/tasks/samba.yml b/roles/nethcfg/tasks/samba.yml index 3ec33b1..ab1d422 100644 --- a/roles/nethcfg/tasks/samba.yml +++ b/roles/nethcfg/tasks/samba.yml @@ -138,7 +138,7 @@ when: force_ibay_shared|bool or chk_shared|failed or check_tempcust|changed # Fixing issue #3 - Configure sudo access for admin on server for operator -# access +# access # https://github.com/bglug-it/server-config/issues/3 - name: Configuring sudo access for admin account lineinfile: diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed index 0cffe82..a8a2d0a 100644 --- a/roles/preseed/templates/preseed/aula-trusty.seed +++ b/roles/preseed/templates/preseed/aula-trusty.seed @@ -45,7 +45,7 @@ d-i apt-setup/local0/key string http://keyserver.ubuntu.com:11371/pks/lookup # Setup and enable ansible PPA d-i apt-setup/local1/repository string http://{{ execpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main d-i apt-setup/local1/comment string Ansible Official PPA -d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get +d-i apt-setup/local1/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367&op=get # Setup and enable epoptes PPA d-i apt-setup/local2/repository string http://{{ execpath }}ppa.launchpad.net/epoptes/ppa/ubuntu trusty main diff --git a/roles/pxe/templates/pxelinux.cfg/default b/roles/pxe/templates/pxelinux.cfg/default index f308b0d..f05ff70 100644 --- a/roles/pxe/templates/pxelinux.cfg/default +++ b/roles/pxe/templates/pxelinux.cfg/default @@ -64,7 +64,7 @@ LABEL aula-32bit LINUX /ubuntu/14.04/i386/linux INITRD /ubuntu/14.04/i386/initrd.gz APPEND vga=normal auto=true hostname=kickseed url=http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/aula-trusty.seed -- quiet - + LABEL aula-64bit MENU LABEL ^64 bit LINUX /ubuntu/14.04/amd64/linux