diff --git a/roles/preseed/tasks/repoconfig.yml b/roles/preseed/tasks/repoconfig.yml index 3fcad32..7b1d402 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: Pre-downloading geogebra GPG signature because of HTTPS + 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 a8a2d0a..5e64442 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 e6341b9..5d04438 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 37f0967..5624bbc 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