From aeb184fe562a8df4eca2b298eeee0670b10987c0 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 13 Jun 2017 12:02:49 +0200 Subject: [PATCH] apt-repositories: stretch repositories are different --- apt-repositories/tasks/backports.yml | 8 ++++++++ apt-repositories/tasks/basics.yml | 6 +++++- apt-repositories/tasks/evolix_public.yml | 11 +++++++++++ apt-repositories/tasks/main.yml | 3 +++ apt-repositories/templates/basics.list.j2 | 5 ----- apt-repositories/templates/jessie_basics.list.j2 | 5 +++++ apt-repositories/templates/stretch_basics.list.j2 | 4 ++++ 7 files changed, 36 insertions(+), 6 deletions(-) delete mode 100644 apt-repositories/templates/basics.list.j2 create mode 100644 apt-repositories/templates/jessie_basics.list.j2 create mode 100644 apt-repositories/templates/stretch_basics.list.j2 diff --git a/apt-repositories/tasks/backports.yml b/apt-repositories/tasks/backports.yml index a4f84735..f079a35b 100644 --- a/apt-repositories/tasks/backports.yml +++ b/apt-repositories/tasks/backports.yml @@ -4,6 +4,8 @@ dest: /etc/apt/sources.list regexp: "backports" state: absent + tags: + - apt-repositories - name: Backports sources list is installed template: @@ -13,6 +15,8 @@ backup: yes mode: "0640" notify: apt update + tags: + - apt-repositories - name: Backports configuration copy: @@ -22,6 +26,10 @@ backup: yes mode: "0640" notify: apt update + tags: + - apt-repositories - name: Intermediate flush of handlers meta: flush_handlers + tags: + - apt-repositories diff --git a/apt-repositories/tasks/basics.yml b/apt-repositories/tasks/basics.yml index 67333191..a6aa0f5c 100644 --- a/apt-repositories/tasks/basics.yml +++ b/apt-repositories/tasks/basics.yml @@ -2,12 +2,16 @@ - name: Change basics repositories template: - src: basics.list.j2 + src: "{{ ansible_distribution_release }}_basics.list.j2" dest: /etc/apt/sources.list mode: "0644" force: yes backup: yes notify: apt update + tags: + - apt-repositories - name: Intermediate flush of handlers meta: flush_handlers + tags: + - apt-repositories diff --git a/apt-repositories/tasks/evolix_public.yml b/apt-repositories/tasks/evolix_public.yml index 18053e28..05cde275 100644 --- a/apt-repositories/tasks/evolix_public.yml +++ b/apt-repositories/tasks/evolix_public.yml @@ -1,5 +1,12 @@ --- +- name: Fail if distribution is not supported + fail: + msg: "Error: Evolix public repository is not compatble with 'Debian Stretch' yet." + when: ansible_distribution_release == "stretch" + tags: + - apt-repositories + - name: Evolix public list is installed template: src: evolix_public.list.j2 @@ -8,6 +15,10 @@ backup: yes mode: "0640" notify: apt update + tags: + - apt-repositories - name: Intermediate flush of handlers meta: flush_handlers + tags: + - apt-repositories diff --git a/apt-repositories/tasks/main.yml b/apt-repositories/tasks/main.yml index 09a46c5c..a70febd5 100644 --- a/apt-repositories/tasks/main.yml +++ b/apt-repositories/tasks/main.yml @@ -21,6 +21,9 @@ tags: - apt-repositories +- debug: + var: apt_repositories_install_evolix_public + - name: Install Evolix Public APT repository include: evolix_public.yml when: apt_repositories_install_evolix_public diff --git a/apt-repositories/templates/basics.list.j2 b/apt-repositories/templates/basics.list.j2 deleted file mode 100644 index a2d19e17..00000000 --- a/apt-repositories/templates/basics.list.j2 +++ /dev/null @@ -1,5 +0,0 @@ -# {{ ansible_managed }} - -deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }} {{ apt_repositories_basics_components | mandatory }} -deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }}-updates {{ apt_repositories_basics_components | mandatory }} -deb http://security.debian.org/ {{ ansible_distribution_release }}/updates {{ apt_repositories_basics_components | mandatory }} diff --git a/apt-repositories/templates/jessie_basics.list.j2 b/apt-repositories/templates/jessie_basics.list.j2 new file mode 100644 index 00000000..90237365 --- /dev/null +++ b/apt-repositories/templates/jessie_basics.list.j2 @@ -0,0 +1,5 @@ +# {{ ansible_managed }} + +deb http://mirror.evolix.org/debian/ jessie {{ apt_repositories_basics_components | mandatory }} +deb http://mirror.evolix.org/debian/ jessie-updates {{ apt_repositories_basics_components | mandatory }} +deb http://security.debian.org/ jessie/updates {{ apt_repositories_basics_components | mandatory }} diff --git a/apt-repositories/templates/stretch_basics.list.j2 b/apt-repositories/templates/stretch_basics.list.j2 new file mode 100644 index 00000000..dada4cab --- /dev/null +++ b/apt-repositories/templates/stretch_basics.list.j2 @@ -0,0 +1,4 @@ +# {{ ansible_managed }} + +deb http://deb.debian.org/debian stretch {{ apt_repositories_basics_components | mandatory }} +deb http://security.debian.org/debian-security stretch/updates {{ apt_repositories_basics_components | mandatory }}