From ddeeacdc613798a805a8ab57d7e49e161c7a4177 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Mon, 20 Feb 2017 23:27:23 +0100 Subject: [PATCH] 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