From c612859fdf841cc444e09d8ea4eefc40e0142d04 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Wed, 21 Sep 2016 22:35:53 +0200 Subject: [PATCH] Trying to deposit files on the server for the client configuration. --- roles/preseed/tasks/main.yml | 5 +++ roles/preseed/tasks/repoconfig.yml | 35 +++++++++++++++++++ .../templates/libreoffice-5-trusty.list | 2 -- .../ansible-ansible-trusty.list | 0 .../templates/repoconfig/bglug-trusty.list | 3 ++ .../repoconfig/libreoffice-ppa-trusty.list | 2 ++ .../preseed/templates/repoconfig/sources.list | 19 ++++++++++ roles/ubuntu-mirror/templates/apt-mirror.list | 15 +++----- 8 files changed, 68 insertions(+), 13 deletions(-) create mode 100644 roles/preseed/tasks/repoconfig.yml delete mode 100644 roles/preseed/templates/libreoffice-5-trusty.list rename roles/preseed/templates/{ => repoconfig}/ansible-ansible-trusty.list (100%) create mode 100644 roles/preseed/templates/repoconfig/bglug-trusty.list create mode 100644 roles/preseed/templates/repoconfig/libreoffice-ppa-trusty.list create mode 100644 roles/preseed/templates/repoconfig/sources.list diff --git a/roles/preseed/tasks/main.yml b/roles/preseed/tasks/main.yml index 7cfb590..3c3499b 100644 --- a/roles/preseed/tasks/main.yml +++ b/roles/preseed/tasks/main.yml @@ -8,6 +8,11 @@ tags: - preseed +- include: repoconfig.yml + tags: + - preseed + - repoconfig + - include: firefoxcert.yml tags: - firefox diff --git a/roles/preseed/tasks/repoconfig.yml b/roles/preseed/tasks/repoconfig.yml new file mode 100644 index 0000000..8b0d021 --- /dev/null +++ b/roles/preseed/tasks/repoconfig.yml @@ -0,0 +1,35 @@ +--- +# Configuring the base repositories files. +# Composing here files to be used by clients will reduce time to load/construct +# them within client-pull-installation playbook. + +- name: Creating base directory for storing repositories files + file: + path: /var/lib/nethserver/ibay/ks/repoconfig + state: directory + owner: root + group: root + mode: 0755 + become: yes + +- name: Preconfiguring base repositories file for clients + template: + src: repoconfig/sources.list + path: /var/lib/nethserver/ibay/ks/repoconfig/sources.list + owner: root + group: root + mode: 0644 + become: yes + +- name: Preconfiguring other repositories for clients + template: + src: "repoconfig/{{ item }}" + path: "/var/lib/nethserver/ibay/ks/repoconfig/{{ item }}" + owner: root + group: root + mode: 0644 + with_items: + - bglug-trusty.list + - ansible-ansible-trusty.list + - libreoffice-ppa-trusty.list + become: yes diff --git a/roles/preseed/templates/libreoffice-5-trusty.list b/roles/preseed/templates/libreoffice-5-trusty.list deleted file mode 100644 index da3ab65..0000000 --- a/roles/preseed/templates/libreoffice-5-trusty.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://{{ execpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main -deb-src http://{{ execpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main diff --git a/roles/preseed/templates/ansible-ansible-trusty.list b/roles/preseed/templates/repoconfig/ansible-ansible-trusty.list similarity index 100% rename from roles/preseed/templates/ansible-ansible-trusty.list rename to roles/preseed/templates/repoconfig/ansible-ansible-trusty.list diff --git a/roles/preseed/templates/repoconfig/bglug-trusty.list b/roles/preseed/templates/repoconfig/bglug-trusty.list new file mode 100644 index 0000000..279b4b1 --- /dev/null +++ b/roles/preseed/templates/repoconfig/bglug-trusty.list @@ -0,0 +1,3 @@ +# Repo BgLUG +deb http://{{ execpath }}repo.bglug.it/ubuntu trusty main +#deb-src http://{{ execpath }}repo.bglug.it/ubuntu trusty main diff --git a/roles/preseed/templates/repoconfig/libreoffice-ppa-trusty.list b/roles/preseed/templates/repoconfig/libreoffice-ppa-trusty.list new file mode 100644 index 0000000..0de7371 --- /dev/null +++ b/roles/preseed/templates/repoconfig/libreoffice-ppa-trusty.list @@ -0,0 +1,2 @@ +deb http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main +#deb-src http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main diff --git a/roles/preseed/templates/repoconfig/sources.list b/roles/preseed/templates/repoconfig/sources.list new file mode 100644 index 0000000..b705988 --- /dev/null +++ b/roles/preseed/templates/repoconfig/sources.list @@ -0,0 +1,19 @@ +# Base repositories for Ubuntu 14.04 - Trusty Tahr +deb http://{{ execpath }}{{ host }}{{ path }} trusty main restricted universe multiverse +deb http://{{ execpath }}{{ host }}{{ path }} trusty-security main restricted universe multiverse +deb http://{{ execpath }}{{ host }}{{ path }} trusty-updates main restricted universe multiverse +deb http://{{ execpath }}{{ host }}{{ path }} trusty-backports main restricted universe multiverse + +# Sources +#deb-src http://{{ execpath }}{{ host }}{{ path }} trusty main restricted universe multiverse +#deb-src http://{{ execpath }}{{ host }}{{ path }} trusty-security main restricted universe multiverse +#deb-src http://{{ execpath }}{{ host }}{{ path }} trusty-updates main restricted universe multiverse +#deb-src http://{{ execpath }}{{ host }}{{ path }} trusty-backports main restricted universe multiverse + +# Security +deb http://{{ execpath }}{{ shost }}{{ spath }} trusty-security main restricted universe multiverse +#deb-src http://{{ execpath }}{{ shost }}{{ spath }} trusty-security main restricted universe multiverse + +# Extras +deb http://{{ execpath }}extras.ubuntu.com/ubuntu trusty main +deb http://{{ execpath }}archive.canonical.com/ trusty partner diff --git a/roles/ubuntu-mirror/templates/apt-mirror.list b/roles/ubuntu-mirror/templates/apt-mirror.list index 622666f..acc0daf 100644 --- a/roles/ubuntu-mirror/templates/apt-mirror.list +++ b/roles/ubuntu-mirror/templates/apt-mirror.list @@ -22,31 +22,26 @@ set _tilde 0 deb-i386 http://{{ host }}{{ path }} trusty main restricted universe multiverse deb-i386 http://{{ host }}{{ path }} trusty-security main restricted universe multiverse deb-i386 http://{{ host }}{{ path }} trusty-updates main restricted universe multiverse -deb-i386 http://{{ host }}{{ path }} trusty-proposed main restricted universe multiverse deb-i386 http://{{ host }}{{ path }} trusty-backports main restricted universe multiverse deb-amd64 http://{{ host }}{{ path }} trusty main restricted universe multiverse deb-amd64 http://{{ host }}{{ path }} trusty-security main restricted universe multiverse deb-amd64 http://{{ host }}{{ path }} trusty-updates main restricted universe multiverse -deb-amd64 http://{{ host }}{{ path }} trusty-proposed main restricted universe multiverse deb-amd64 http://{{ host }}{{ path }} trusty-backports main restricted universe multiverse deb-src http://{{ host }}{{ path }} trusty main restricted universe multiverse deb-src http://{{ host }}{{ path }} trusty-security main restricted universe multiverse deb-src http://{{ host }}{{ path }} trusty-updates main restricted universe multiverse -deb-src http://{{ host }}{{ path }} trusty-proposed main restricted universe multiverse deb-src http://{{ host }}{{ path }} trusty-backports main restricted universe multiverse deb-i386 http://{{ host }}{{ path }} trusty main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer deb-i386 http://{{ host }}{{ path }} trusty-security main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer deb-i386 http://{{ host }}{{ path }} trusty-updates main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer -deb-i386 http://{{ host }}{{ path }} trusty-proposed main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer deb-i386 http://{{ host }}{{ path }} trusty-backports main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer deb-amd64 http://{{ host }}{{ path }} trusty main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer deb-amd64 http://{{ host }}{{ path }} trusty-security main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer deb-amd64 http://{{ host }}{{ path }} trusty-updates main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer -deb-amd64 http://{{ host }}{{ path }} trusty-proposed main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer deb-amd64 http://{{ host }}{{ path }} trusty-backports main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer deb-i386 http://extras.ubuntu.com/ubuntu trusty main @@ -54,10 +49,8 @@ deb-amd64 http://extras.ubuntu.com/ubuntu trusty main deb-src http://extras.ubuntu.com/ubuntu trusty main deb-i386 http://archive.canonical.com/ trusty partner -deb-i386 http://archive.canonical.com/ trusty-proposed partner deb-amd64 http://archive.canonical.com/ trusty partner -deb-amd64 http://archive.canonical.com/ trusty-proposed partner deb-i386 http://{{ shost }}{{ spath }} trusty-security main restricted universe multiverse deb-i386 http://{{ shost }}{{ spath }} trusty-security main/debian-installer restricted/debian-installer universe/debian-installer multiverse/debian-installer @@ -70,9 +63,9 @@ deb-i386 http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main deb-amd64 http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main # LibreOffice PPA -deb-i386 http://ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main -deb-amd64 http://ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main -deb-src http://ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main +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 # BgLUG deb-i386 http://repo.bglug.it/ubuntu trusty main @@ -84,5 +77,5 @@ clean http://extras.ubuntu.com/ubuntu clean http://archive.canonical.com clean http://{{ shost }}{{ spath }} clean http://ppa.launchpad.net/ansible/ansible/ubuntu -clean http://ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu +clean http://ppa.launchpad.net/libreoffice/ppa/ubuntu clean http://repo.bglug.it/ubuntu