From b9a4fdf79ae5865e4111e88dad7ed77b7973bf86 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 10 Jan 2017 10:18:42 +0100 Subject: [PATCH] apt-repositories: extract sections --- apt-repositories/defaults/main.yml | 1 + apt-repositories/tasks/backports.yml | 43 +++++++++++++++++++++++++++ apt-repositories/tasks/main.yml | 44 ++-------------------------- 3 files changed, 47 insertions(+), 41 deletions(-) create mode 100644 apt-repositories/tasks/backports.yml diff --git a/apt-repositories/defaults/main.yml b/apt-repositories/defaults/main.yml index 837ff138..b6be7084 100644 --- a/apt-repositories/defaults/main.yml +++ b/apt-repositories/defaults/main.yml @@ -1 +1,2 @@ apt_repositories_components: "main" +apt_repositories_backports: True diff --git a/apt-repositories/tasks/backports.yml b/apt-repositories/tasks/backports.yml new file mode 100644 index 00000000..7d249b90 --- /dev/null +++ b/apt-repositories/tasks/backports.yml @@ -0,0 +1,43 @@ +--- + +- name: Backports sources list is installed + template: + src: jessie_backports.list.j2 + dest: /etc/apt/sources.list.d/backports.list + force: yes + backup: yes + mode: "640" + notify: apt update + when: ansible_distribution_major_version == '8' + +- name: Backports sources list is installed + template: + src: stretch_backports.list.j2 + dest: /etc/apt/sources.list.d/backports.list + force: yes + backup: yes + mode: "640" + notify: apt update + when: ansible_distribution_major_version == '9' + +- name: Backports configuration + copy: + src: jessie_backports_preferences + dest: /etc/apt/preferences.d/backports + force: yes + backup: yes + mode: "640" + notify: apt update + when: ansible_distribution_major_version == '8' + +- name: Backports configuration + copy: + src: stretch_backports_preferences + dest: /etc/apt/preferences.d/backports + force: yes + backup: yes + mode: "640" + notify: apt update + when: ansible_distribution_major_version == '9' + +- meta: flush_handlers diff --git a/apt-repositories/tasks/main.yml b/apt-repositories/tasks/main.yml index 7d249b90..dca2744a 100644 --- a/apt-repositories/tasks/main.yml +++ b/apt-repositories/tasks/main.yml @@ -1,43 +1,5 @@ --- -- name: Backports sources list is installed - template: - src: jessie_backports.list.j2 - dest: /etc/apt/sources.list.d/backports.list - force: yes - backup: yes - mode: "640" - notify: apt update - when: ansible_distribution_major_version == '8' - -- name: Backports sources list is installed - template: - src: stretch_backports.list.j2 - dest: /etc/apt/sources.list.d/backports.list - force: yes - backup: yes - mode: "640" - notify: apt update - when: ansible_distribution_major_version == '9' - -- name: Backports configuration - copy: - src: jessie_backports_preferences - dest: /etc/apt/preferences.d/backports - force: yes - backup: yes - mode: "640" - notify: apt update - when: ansible_distribution_major_version == '8' - -- name: Backports configuration - copy: - src: stretch_backports_preferences - dest: /etc/apt/preferences.d/backports - force: yes - backup: yes - mode: "640" - notify: apt update - when: ansible_distribution_major_version == '9' - -- meta: flush_handlers +- name: Install APT Backports + include: backports.yml + when: apt_repositories_backports