From dd4734ce4b3cc021d3502eca104ae640d51300ad Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Thu, 5 Nov 2015 01:44:58 +0100 Subject: [PATCH] Managed different type of mirrors from domain.yml file. little changes on proxy certificate. --- roles/base/tasks/main.yml | 5 +- .../templates/ansible-ansible-trusty.list | 4 +- roles/base/templates/sources.list | 48 +++++++++---------- roles/domain/tasks/sslproxy.yml | 2 +- roles/prereq/defaults/main.yml | 2 + roles/prereq/tasks/main.yml | 6 +++ roles/prereq/templates/ansible.list | 2 +- roles/prereq/templates/libreoffice.list | 2 +- roles/prereq/templates/sources.list | 20 ++++---- roles/prereq/templates/sys42.list | 2 +- 10 files changed, 49 insertions(+), 44 deletions(-) create mode 100644 roles/prereq/defaults/main.yml diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 769a9b0..62cca19 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -3,10 +3,7 @@ # At the end of system configuration, we should have a complete # Edubuntu system -#- include: ansible-pull.yml -# tags: -# - base -# - ansible-pull +# Requires fact execmirrorpath, already set by prereq role. - include: apt-sources.yml tags: diff --git a/roles/base/templates/ansible-ansible-trusty.list b/roles/base/templates/ansible-ansible-trusty.list index b3a40a2..bef18f0 100644 --- a/roles/base/templates/ansible-ansible-trusty.list +++ b/roles/base/templates/ansible-ansible-trusty.list @@ -1,2 +1,2 @@ -deb http://{{ ansible_local.domain.mirrorpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main -# deb-src http://{{ ansible_local.domain.mirrorpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main +deb http://{{ execmirrorpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main +# deb-src http://{{ execmirrorpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main diff --git a/roles/base/templates/sources.list b/roles/base/templates/sources.list index fb5be0f..82c653e 100644 --- a/roles/base/templates/sources.list +++ b/roles/base/templates/sources.list @@ -2,55 +2,55 @@ # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to # newer versions of the distribution. -deb http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty main restricted -deb-src http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty main restricted +deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty main restricted +deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty main restricted ## Major bug fix updates produced after the final release of the ## distribution. -deb http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates main restricted -deb-src http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates main restricted +deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates main restricted +deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates main restricted ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team. Also, please note that software in universe WILL NOT receive any ## review or updates from the Ubuntu security team. -deb http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty universe -deb-src http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty universe -deb http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates universe -deb-src http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates universe +deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty universe +deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty universe +deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates universe +deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates universe ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team, and may not be under a free licence. Please satisfy yourself as to ## your rights to use the software. Also, please note that software in ## multiverse WILL NOT receive any review or updates from the Ubuntu ## security team. -deb http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty multiverse -deb-src http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty multiverse -deb http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates multiverse -deb-src http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates multiverse +deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty multiverse +deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty multiverse +deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates multiverse +deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates multiverse ## N.B. software from this repository may not have been tested as ## extensively as that contained in the main release, although it includes ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. -deb http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse -deb-src http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse +deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse +deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse -deb http://{{ ansible_local.domain.mirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted -deb-src http://{{ ansible_local.domain.mirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted -deb http://{{ ansible_local.domain.mirrorpath }}security.ubuntu.com/ubuntu trusty-security universe -deb-src http://{{ ansible_local.domain.mirrorpath }}security.ubuntu.com/ubuntu trusty-security universe -deb http://{{ ansible_local.domain.mirrorpath }}security.ubuntu.com/ubuntu trusty-security multiverse -deb-src http://{{ ansible_local.domain.mirrorpath }}security.ubuntu.com/ubuntu trusty-security multiverse +deb http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted +deb-src http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted +deb http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security universe +deb-src http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security universe +deb http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security multiverse +deb-src http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. ## This software is not part of Ubuntu, but is offered by Canonical and the ## respective vendors as a service to Ubuntu users. -# deb http://{{ ansible_local.domain.mirrorpath }}archive.canonical.com/ubuntu trusty partner -# deb-src http://{{ ansible_local.domain.mirrorpath }}archive.canonical.com/ubuntu trusty partner +# deb http://{{ execmirrorpath }}archive.canonical.com/ubuntu trusty partner +# deb-src http://{{ execmirrorpath }}archive.canonical.com/ubuntu trusty partner ## This software is not part of Ubuntu, but is offered by third-party ## developers who want to ship their latest software. -deb http://{{ ansible_local.domain.mirrorpath }}extras.ubuntu.com/ubuntu trusty main -deb-src http://{{ ansible_local.domain.mirrorpath }}extras.ubuntu.com/ubuntu trusty main +deb http://{{ execmirrorpath }}extras.ubuntu.com/ubuntu trusty main +deb-src http://{{ execmirrorpath }}extras.ubuntu.com/ubuntu trusty main diff --git a/roles/domain/tasks/sslproxy.yml b/roles/domain/tasks/sslproxy.yml index 586d909..1576630 100644 --- a/roles/domain/tasks/sslproxy.yml +++ b/roles/domain/tasks/sslproxy.yml @@ -24,4 +24,4 @@ - name: Firefox settings to include certificate get_url: url: 'http://{{ ansible_local.domain.serverfqdn }}/ks/server-ca/cert8.db' - dest: /usr/lib/firefox/browser/defaults/profile + dest: /usr/lib/firefox/browser/defaults/profile/cert8.db diff --git a/roles/prereq/defaults/main.yml b/roles/prereq/defaults/main.yml new file mode 100644 index 0000000..32b0575 --- /dev/null +++ b/roles/prereq/defaults/main.yml @@ -0,0 +1,2 @@ +--- +execmirrorpath: "" diff --git a/roles/prereq/tasks/main.yml b/roles/prereq/tasks/main.yml index 84df53a..2311db2 100644 --- a/roles/prereq/tasks/main.yml +++ b/roles/prereq/tasks/main.yml @@ -1,4 +1,10 @@ --- + +- name: Configuring executive mirrorpath + set_fact: + execmirrorpath: "{{ ansible_local.domain.mirrorpath}}" + when: ansible_local.domain.mirror_mode == 'local' or ansible_local.domain.mirror_mode == 'nfs' + - include: prereq.yml tags: prereq diff --git a/roles/prereq/templates/ansible.list b/roles/prereq/templates/ansible.list index 53002a8..cbc56f3 100644 --- a/roles/prereq/templates/ansible.list +++ b/roles/prereq/templates/ansible.list @@ -1,2 +1,2 @@ ## Ansible Official PPA -deb http://{{ ansible_local.domain.mirrorpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main +deb http://{{ execmirrorpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main diff --git a/roles/prereq/templates/libreoffice.list b/roles/prereq/templates/libreoffice.list index 13b7e57..5143bd2 100644 --- a/roles/prereq/templates/libreoffice.list +++ b/roles/prereq/templates/libreoffice.list @@ -1,2 +1,2 @@ ## LibreOffice Official PPA -deb http://{{ ansible_local.domain.mirrorpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main +deb http://{{ execmirrorpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main diff --git a/roles/prereq/templates/sources.list b/roles/prereq/templates/sources.list index 63160be..7ff4c9c 100644 --- a/roles/prereq/templates/sources.list +++ b/roles/prereq/templates/sources.list @@ -1,19 +1,19 @@ # Base -deb http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu trusty main restricted universe multiverse -deb-src http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu trusty main restricted universe multiverse +deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty main restricted universe multiverse +deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty main restricted universe multiverse # updates -deb http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse -deb-src http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse +deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse +deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse # backports -deb http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse -deb-src http://{{ ansible_local.domain.mirrorpath }}archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse +deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse +deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse # security -deb http://{{ ansible_local.domain.mirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse -deb-src http://{{ ansible_local.domain.mirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse +deb http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse +deb-src http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse # extras -deb http://{{ ansible_local.domain.mirrorpath }}extras.ubuntu.com/ubuntu trusty main -deb-src http://{{ ansible_local.domain.mirrorpath }}extras.ubuntu.com/ubuntu trusty main +deb http://{{ execmirrorpath }}extras.ubuntu.com/ubuntu trusty main +deb-src http://{{ execmirrorpath }}extras.ubuntu.com/ubuntu trusty main diff --git a/roles/prereq/templates/sys42.list b/roles/prereq/templates/sys42.list index ae5fca1..25560ba 100644 --- a/roles/prereq/templates/sys42.list +++ b/roles/prereq/templates/sys42.list @@ -1,2 +1,2 @@ # BgLUG repo @ sys42 -deb http://{{ ansible_local.domain.mirrorpath }}bglug.sys42.eu/ubuntu trusty main +deb http://{{ execmirrorpath }}bglug.sys42.eu/ubuntu trusty main