diff --git a/apt-repositories/README.md b/apt-repositories/README.md index 3bdb1c22..af7876b0 100644 --- a/apt-repositories/README.md +++ b/apt-repositories/README.md @@ -14,7 +14,8 @@ Tasks are extracted in several files, included in `tasks/main.yml` : * `apt_repositories_install_backports` : install backports sources (default: `False`) ; * `apt_repositories_backports_components` : backports sources (default: `main`) ; * `apt_repositories_change_basics_components` : change basic sources components (default: `False`) ; -* `apt_repositories_backports_components` : basic sources components (default: `main`). +* `apt_repositories_backports_components` : basic sources components (default: `main`) ; +* `apt_repositories_install_evolix_public` : install Evolix public repositories (default: `True`). ## Examples diff --git a/apt-repositories/defaults/main.yml b/apt-repositories/defaults/main.yml index 965a2195..e5b42f4a 100644 --- a/apt-repositories/defaults/main.yml +++ b/apt-repositories/defaults/main.yml @@ -3,3 +3,5 @@ apt_repositories_basics_components: "main" apt_repositories_install_backports: False apt_repositories_backports_components: "main" + +apt_repositories_install_evolix_public: True diff --git a/apt-repositories/tasks/evolix_public.yml b/apt-repositories/tasks/evolix_public.yml new file mode 100644 index 00000000..3dd504d4 --- /dev/null +++ b/apt-repositories/tasks/evolix_public.yml @@ -0,0 +1,10 @@ +--- + +- name: Evolix public list is installed + template: + src: evolix_public.list.j2 + dest: /etc/apt/sources.list.d/evolix_public.list + force: yes + backup: yes + mode: "0640" + notify: apt update diff --git a/apt-repositories/tasks/main.yml b/apt-repositories/tasks/main.yml index 685ac423..6e5b9869 100644 --- a/apt-repositories/tasks/main.yml +++ b/apt-repositories/tasks/main.yml @@ -15,5 +15,9 @@ include: backports.yml when: apt_repositories_install_backports +- name: Install Evolix Public APT repository + include: evolix_public.yml + when: apt_repositories_install_evolix_public + - name: Intermediate flush of handlers meta: flush_handlers diff --git a/evolinux-base/templates/apt/evolix_public.list.j2 b/apt-repositories/templates/evolix_public.list.j2 similarity index 100% rename from evolinux-base/templates/apt/evolix_public.list.j2 rename to apt-repositories/templates/evolix_public.list.j2 diff --git a/evolinux-base/tasks/apt.yml b/evolinux-base/tasks/apt.yml index 626ee3ff..8dc968fe 100644 --- a/evolinux-base/tasks/apt.yml +++ b/evolinux-base/tasks/apt.yml @@ -51,15 +51,6 @@ - "deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }}-updates {{ evolinux_apt_repositories_components | mandatory }}" when: evolinux_apt_basic_sources -- name: Evolix public list is installed - template: - src: apt/evolix_public.list.j2 - dest: /etc/apt/sources.list.d/evolix_public.list - force: yes - backup: yes - mode: "0640" - when: evolinux_apt_public_sources - - name: Remove Aptitude apt: name: aptitude diff --git a/vrrpd/tasks/main.yml b/vrrpd/tasks/main.yml index 934408e9..577efce9 100644 --- a/vrrpd/tasks/main.yml +++ b/vrrpd/tasks/main.yml @@ -1,4 +1,10 @@ --- +- name: Install Evolix public repositry + include_role: + name: apt-repositories + vars: + apt_repositories_install_evolix_public: True + - name: Install vrrpd packages apt: name: vrrpd=1.0-2.evolix