From 9a2522357bff0148c1e901daa688dd7d78a673c7 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Fri, 8 Sep 2017 16:52:24 +0200 Subject: [PATCH] Correzione firma geogebra. Correzione punto di mountaggio NFS e tipo. --- roles/preseed/tasks/repoconfig.yml | 6 ++++++ roles/preseed/templates/preseed/aula-trusty.seed | 2 +- roles/preseed/templates/preseed/client-trusty.seed | 2 +- roles/preseed/templates/preseed/docenti-trusty.seed | 2 +- roles/ubuntu-mirror/tasks/nfs-mirror.yml | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/roles/preseed/tasks/repoconfig.yml b/roles/preseed/tasks/repoconfig.yml index 3fcad32..aeeafe5 100644 --- a/roles/preseed/tasks/repoconfig.yml +++ b/roles/preseed/tasks/repoconfig.yml @@ -35,3 +35,9 @@ - epoptes-ppa-trusty.list - geogebra-stable.list become: yes + +- name: Scarico firma per geogebra + get_url: + url: "https://www.geogebra.net/linux/office@geogebra.org.gpg.key" + dest: "/var/lib/nethserver/ibay/ks/repoconfig/office_geogebra.gpg.key" + become: yes diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed index 1a21669..8bb4f5a 100644 --- a/roles/preseed/templates/preseed/aula-trusty.seed +++ b/roles/preseed/templates/preseed/aula-trusty.seed @@ -55,7 +55,7 @@ d-i apt-setup/local2/key string http://keyserver.ubuntu.com:11371/pks/lookup # Setup and enable geogebra repository 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 +d-i apt-setup/local3/key string http://{{ ansible_local.domain.serverfqdn }}/ks/repoconfig/office_geogebra.gpg.key # 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 cc5a064..18942ec 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -55,7 +55,7 @@ d-i apt-setup/local2/key string http://keyserver.ubuntu.com:11371/pks/lookup # Setup and enable geogebra repository 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 +d-i apt-setup/local3/key string http://{{ ansible_local.domain.serverfqdn }}/ks/repoconfig/office_geogebra.gpg.key # 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 a6c0d7a..9d7d569 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -55,7 +55,7 @@ d-i apt-setup/local2/key string http://keyserver.ubuntu.com:11371/pks/lookup # Setup and enable geogebra repository 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 +d-i apt-setup/local3/key string http://{{ ansible_local.domain.serverfqdn }}/ks/repoconfig/office_geogebra.gpg.key # Time and date d-i clock-setup/utc boolean true diff --git a/roles/ubuntu-mirror/tasks/nfs-mirror.yml b/roles/ubuntu-mirror/tasks/nfs-mirror.yml index 26fa5f1..388c7d0 100644 --- a/roles/ubuntu-mirror/tasks/nfs-mirror.yml +++ b/roles/ubuntu-mirror/tasks/nfs-mirror.yml @@ -28,9 +28,9 @@ - name: Adding mountpoint to fstab lineinfile: dest: /etc/fstab - line: "{{ ansible_local.domain.mirror_nfs_share }} /var/spool/apt-mirror/mirror nfs4 defaults 0 0" + line: "{{ ansible_local.domain.mirror_nfs_share }} /var/spool/apt-mirror nfs defaults 0 0" when: chk_mount_nfs|changed - name: Mounting share - shell: mount /var/spool/apt-mirror/mirror + shell: mount /var/spool/apt-mirror when: chk_mount_nfs|changed