diff --git a/apt-repositories/README.md b/apt-repositories/README.md deleted file mode 100644 index 7eaff8b5..00000000 --- a/apt-repositories/README.md +++ /dev/null @@ -1,57 +0,0 @@ -# apt-repositories - -A few APT related operations, like easily install backports of change components for repositories. - -## Tasks - -Tasks are extracted in several files, included in `tasks/main.yml` : - -* `backports.yml` : add a sources list for backports ; -* `basics_components.yml` : replace components for the basic sources. - -## Available variables - -* `apt_repositories_install_basics` : change basic sources components (default: `True`) ; -* `apt_repositories_basics_components` : basic sources components (default: `main`) ; -* `apt_repositories_install_backports` : install backports sources (default: `False`) ; -* `apt_repositories_backports_components` : backports sources (default: `main`) ; -* `apt_repositories_install_evolix_public` : install Evolix public repositories (default: `True`). - -## Examples - -To add "non-free" and "contrib" components to basic sources lists : - -``` -{ role: apt-repositories, - apt_repositories_install_basics: True, - apt_repositories_basics_components: "main non-free contrib" -} -``` - -To install backports sources lists : - -``` -{ role: apt-repositories, - apt_repositories_install_backports: True -} -``` - -To install backports sources lists with "non-free" and "contrib" : - -``` -{ role: apt-repositories, - apt_repositories_install_backports: True, - apt_repositories_backports_components: "main non-free contrib" -} -``` - -To install backports sources lists and have "non-free" and "contrib" for each repository : - -``` -{ role: apt-repositories, - apt_repositories_install_basics: True, - apt_repositories_basics_components: "main non-free contrib", - apt_repositories_install_backports: True, - apt_repositories_backports_components: "main non-free contrib" -} -``` diff --git a/apt-repositories/defaults/main.yml b/apt-repositories/defaults/main.yml deleted file mode 100644 index 47c3016f..00000000 --- a/apt-repositories/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ -apt_repositories_install_basics: True -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/templates/jessie_backports.list.j2 b/apt-repositories/templates/jessie_backports.list.j2 deleted file mode 100644 index 863c242c..00000000 --- a/apt-repositories/templates/jessie_backports.list.j2 +++ /dev/null @@ -1,3 +0,0 @@ -# {{ ansible_managed }} - -deb http://mirror.evolix.org/debian jessie-backports {{ apt_repositories_backports_components | mandatory }} diff --git a/apt-repositories/templates/jessie_basics.list.j2 b/apt-repositories/templates/jessie_basics.list.j2 deleted file mode 100644 index 90237365..00000000 --- a/apt-repositories/templates/jessie_basics.list.j2 +++ /dev/null @@ -1,5 +0,0 @@ -# {{ 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_backports.list.j2 b/apt-repositories/templates/stretch_backports.list.j2 deleted file mode 100644 index ce887449..00000000 --- a/apt-repositories/templates/stretch_backports.list.j2 +++ /dev/null @@ -1,3 +0,0 @@ -# {{ ansible_managed }} - -deb http://mirror.evolix.org/debian stretch-backports {{ apt_repositories_backports_components | mandatory }} diff --git a/apt-repositories/templates/stretch_basics.list.j2 b/apt-repositories/templates/stretch_basics.list.j2 deleted file mode 100644 index eac2c1fb..00000000 --- a/apt-repositories/templates/stretch_basics.list.j2 +++ /dev/null @@ -1,5 +0,0 @@ -# {{ ansible_managed }} - -deb http://mirror.evolix.org/debian stretch {{ apt_repositories_basics_components | mandatory }} -deb http://mirror.evolix.org/debian/ stretch-updates {{ apt_repositories_basics_components | mandatory }} -deb http://security.debian.org/debian-security stretch/updates {{ apt_repositories_basics_components | mandatory }} diff --git a/apt-repositories/tests/test.yml b/apt-repositories/tests/test.yml deleted file mode 100644 index a6c49fe6..00000000 --- a/apt-repositories/tests/test.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- hosts: test-kitchen - - vars: - apt_repositories_basics_components: "main contrib non-free" - apt_repositories_install_backports: True - apt_repositories_backports_components: "main contrib non-free" - - roles: - - role: apt-repositories diff --git a/apt-repositories/.kitchen.yml b/apt/.kitchen.yml similarity index 92% rename from apt-repositories/.kitchen.yml rename to apt/.kitchen.yml index 65139ac6..a950bb61 100644 --- a/apt-repositories/.kitchen.yml +++ b/apt/.kitchen.yml @@ -28,7 +28,7 @@ suites: playbook: ./tests/test.yml verifier: patterns: - - apt-repositories/tests/spec/main_spec.rb + - apt/tests/spec/main_spec.rb bundler_path: '/usr/local/bin' rspec_path: '/usr/local/bin' diff --git a/apt/README.md b/apt/README.md new file mode 100644 index 00000000..ec4da5b6 --- /dev/null +++ b/apt/README.md @@ -0,0 +1,57 @@ +# apt + +A few APT related operations, like easily install backports of change components for repositories. + +## Tasks + +Tasks are extracted in several files, included in `tasks/main.yml` : + +* `backports.yml` : add a sources list for backports ; +* `basics_components.yml` : replace components for the basic sources. + +## Available variables + +* `apt_install_basics` : change basic sources components (default: `True`) ; +* `apt_basics_components` : basic sources components (default: `main`) ; +* `apt_install_backports` : install backports sources (default: `False`) ; +* `apt_backports_components` : backports sources (default: `main`) ; +* `apt_install_evolix_public` : install Evolix public repositories (default: `True`). + +## Examples + +To add "non-free" and "contrib" components to basic sources lists : + +``` +{ role: apt, + apt_install_basics: True, + apt_basics_components: "main non-free contrib" +} +``` + +To install backports sources lists : + +``` +{ role: apt, + apt_install_backports: True +} +``` + +To install backports sources lists with "non-free" and "contrib" : + +``` +{ role: apt, + apt_install_backports: True, + apt_backports_components: "main non-free contrib" +} +``` + +To install backports sources lists and have "non-free" and "contrib" for each repository : + +``` +{ role: apt, + apt_install_basics: True, + apt_basics_components: "main non-free contrib", + apt_install_backports: True, + apt_backports_components: "main non-free contrib" +} +``` diff --git a/apt/defaults/main.yml b/apt/defaults/main.yml new file mode 100644 index 00000000..671bc8b2 --- /dev/null +++ b/apt/defaults/main.yml @@ -0,0 +1,7 @@ +apt_install_basics: True +apt_basics_components: "main" + +apt_install_backports: False +apt_backports_components: "main" + +apt_install_evolix_public: True diff --git a/apt-repositories/files/jessie_backports_preferences b/apt/files/jessie_backports_preferences similarity index 100% rename from apt-repositories/files/jessie_backports_preferences rename to apt/files/jessie_backports_preferences diff --git a/apt-repositories/files/stretch_backports_preferences b/apt/files/stretch_backports_preferences similarity index 100% rename from apt-repositories/files/stretch_backports_preferences rename to apt/files/stretch_backports_preferences diff --git a/apt-repositories/handlers/main.yml b/apt/handlers/main.yml similarity index 100% rename from apt-repositories/handlers/main.yml rename to apt/handlers/main.yml diff --git a/apt-repositories/meta/main.yml b/apt/meta/main.yml similarity index 100% rename from apt-repositories/meta/main.yml rename to apt/meta/main.yml diff --git a/apt-repositories/tasks/backports.yml b/apt/tasks/backports.yml similarity index 88% rename from apt-repositories/tasks/backports.yml rename to apt/tasks/backports.yml index ad606fe8..fd459a34 100644 --- a/apt-repositories/tasks/backports.yml +++ b/apt/tasks/backports.yml @@ -5,7 +5,7 @@ regexp: "backports" state: absent tags: - - apt-repositories + - apt - name: Backports sources list is installed template: @@ -15,7 +15,7 @@ mode: "0640" notify: apt update tags: - - apt-repositories + - apt - name: Backports configuration copy: @@ -25,9 +25,9 @@ mode: "0640" notify: apt update tags: - - apt-repositories + - apt - name: Intermediate flush of handlers meta: flush_handlers tags: - - apt-repositories + - apt diff --git a/apt-repositories/tasks/basics.yml b/apt/tasks/basics.yml similarity index 86% rename from apt-repositories/tasks/basics.yml rename to apt/tasks/basics.yml index 78e16810..5fefbbfc 100644 --- a/apt-repositories/tasks/basics.yml +++ b/apt/tasks/basics.yml @@ -8,9 +8,9 @@ force: yes notify: apt update tags: - - apt-repositories + - apt - name: Intermediate flush of handlers meta: flush_handlers tags: - - apt-repositories + - apt diff --git a/apt-repositories/tasks/evolix_public.yml b/apt/tasks/evolix_public.yml similarity index 90% rename from apt-repositories/tasks/evolix_public.yml rename to apt/tasks/evolix_public.yml index bd1e10ce..9b04c971 100644 --- a/apt-repositories/tasks/evolix_public.yml +++ b/apt/tasks/evolix_public.yml @@ -5,7 +5,7 @@ # msg: "Error: Evolix public repository is not compatble with 'Debian Stretch' yet." # when: ansible_distribution_release == "stretch" # tags: -# - apt-repositories +# - apt - name: Add Evolix GPG key @@ -21,9 +21,9 @@ mode: "0640" notify: apt update tags: - - apt-repositories + - apt - name: Intermediate flush of handlers meta: flush_handlers tags: - - apt-repositories + - apt diff --git a/apt-repositories/tasks/main.yml b/apt/tasks/main.yml similarity index 66% rename from apt-repositories/tasks/main.yml rename to apt/tasks/main.yml index a70febd5..b179ba4f 100644 --- a/apt-repositories/tasks/main.yml +++ b/apt/tasks/main.yml @@ -7,25 +7,25 @@ - ansible_distribution_release != "jessie" - ansible_distribution_release != "stretch" tags: - - apt-repositories + - apt - name: Install basics repositories include: basics.yml - when: apt_repositories_install_basics + when: apt_install_basics tags: - - apt-repositories + - apt - name: Install APT Backports repository include: backports.yml - when: apt_repositories_install_backports + when: apt_install_backports tags: - - apt-repositories + - apt - debug: - var: apt_repositories_install_evolix_public + var: apt_install_evolix_public - name: Install Evolix Public APT repository include: evolix_public.yml - when: apt_repositories_install_evolix_public + when: apt_install_evolix_public tags: - - apt-repositories + - apt diff --git a/apt-repositories/templates/evolix_public.list.j2 b/apt/templates/evolix_public.list.j2 similarity index 100% rename from apt-repositories/templates/evolix_public.list.j2 rename to apt/templates/evolix_public.list.j2 diff --git a/apt/templates/jessie_backports.list.j2 b/apt/templates/jessie_backports.list.j2 new file mode 100644 index 00000000..cba40470 --- /dev/null +++ b/apt/templates/jessie_backports.list.j2 @@ -0,0 +1,3 @@ +# {{ ansible_managed }} + +deb http://mirror.evolix.org/debian jessie-backports {{ apt_backports_components | mandatory }} diff --git a/apt/templates/jessie_basics.list.j2 b/apt/templates/jessie_basics.list.j2 new file mode 100644 index 00000000..684b7bb3 --- /dev/null +++ b/apt/templates/jessie_basics.list.j2 @@ -0,0 +1,5 @@ +# {{ ansible_managed }} + +deb http://mirror.evolix.org/debian/ jessie {{ apt_basics_components | mandatory }} +deb http://mirror.evolix.org/debian/ jessie-updates {{ apt_basics_components | mandatory }} +deb http://security.debian.org/ jessie/updates {{ apt_basics_components | mandatory }} diff --git a/apt/templates/stretch_backports.list.j2 b/apt/templates/stretch_backports.list.j2 new file mode 100644 index 00000000..4f69547d --- /dev/null +++ b/apt/templates/stretch_backports.list.j2 @@ -0,0 +1,3 @@ +# {{ ansible_managed }} + +deb http://mirror.evolix.org/debian stretch-backports {{ apt_backports_components | mandatory }} diff --git a/apt/templates/stretch_basics.list.j2 b/apt/templates/stretch_basics.list.j2 new file mode 100644 index 00000000..2f0bf99e --- /dev/null +++ b/apt/templates/stretch_basics.list.j2 @@ -0,0 +1,5 @@ +# {{ ansible_managed }} + +deb http://mirror.evolix.org/debian stretch {{ apt_basics_components | mandatory }} +deb http://mirror.evolix.org/debian/ stretch-updates {{ apt_basics_components | mandatory }} +deb http://security.debian.org/debian-security stretch/updates {{ apt_basics_components | mandatory }} diff --git a/apt-repositories/tests/spec/main_spec.rb b/apt/tests/spec/main_spec.rb similarity index 100% rename from apt-repositories/tests/spec/main_spec.rb rename to apt/tests/spec/main_spec.rb diff --git a/apt/tests/test.yml b/apt/tests/test.yml new file mode 100644 index 00000000..fce03b45 --- /dev/null +++ b/apt/tests/test.yml @@ -0,0 +1,10 @@ +--- +- hosts: test-kitchen + + vars: + apt_basics_components: "main contrib non-free" + apt_install_backports: True + apt_backports_components: "main contrib non-free" + + roles: + - role: apt diff --git a/evoacme/tasks/certbot.yml b/evoacme/tasks/certbot.yml index b076f61f..eae7ba86 100644 --- a/evoacme/tasks/certbot.yml +++ b/evoacme/tasks/certbot.yml @@ -3,7 +3,7 @@ - block: - name: install jessie-backports include_role: - name: apt-repositories + name: apt tasks_from: backports.yml - name: Add exceptions for certbot dependances diff --git a/evoadmin/tasks/packages.yml b/evoadmin/tasks/packages.yml index 7fd32de3..e0b1fe05 100644 --- a/evoadmin/tasks/packages.yml +++ b/evoadmin/tasks/packages.yml @@ -1,7 +1,7 @@ --- - include_role: - name: apt-repositories + name: apt tasks_from: evolix_public.yml - meta: flush_handlers diff --git a/evolinux-base/tasks/apt.yml b/evolinux-base/tasks/apt.yml index 0e0df00a..bb0be3fc 100644 --- a/evolinux-base/tasks/apt.yml +++ b/evolinux-base/tasks/apt.yml @@ -1,10 +1,10 @@ --- - include_role: - name: apt-repositories + name: apt vars: - apt_repositories_install_basics: "{{ evolinux_apt_replace_default_sources }}" - apt_repositories_install_evolix_public: "{{ evolinux_apt_public_sources }}" + apt_install_basics: "{{ evolinux_apt_replace_default_sources }}" + apt_install_evolix_public: "{{ evolinux_apt_public_sources }}" - name: Setting apt config lineinfile: diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml index c74b25fe..69ab0889 100644 --- a/evolinux-base/tasks/hardware.yml +++ b/evolinux-base/tasks/hardware.yml @@ -18,10 +18,10 @@ - name: Add non-free repo for Broadcom NetXtreme II include_role: - name: apt-repositories + name: apt tasks_from: basics.yml vars: - apt_repositories_basics_components: "main contrib non-free" + apt_basics_components: "main contrib non-free" when: broadcom|success ## RAID diff --git a/evomaintenance/tasks/main.yml b/evomaintenance/tasks/main.yml index 9fbc10b4..091c59d5 100644 --- a/evomaintenance/tasks/main.yml +++ b/evomaintenance/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install Evolix public repositry include_role: - name: apt-repositories + name: apt tasks_from: evolix_public.yml - name: evomaintenance is installed diff --git a/haproxy/tasks/packages_jessie_backports.yml b/haproxy/tasks/packages_jessie_backports.yml index 2449029d..17218ee6 100644 --- a/haproxy/tasks/packages_jessie_backports.yml +++ b/haproxy/tasks/packages_jessie_backports.yml @@ -1,7 +1,7 @@ --- - include_role: - name: apt-repositories + name: apt tasks_from: backports.yml tags: - haproxy diff --git a/java8/tasks/main.yml b/java8/tasks/main.yml index 1ecebbee..f206b2f3 100644 --- a/java8/tasks/main.yml +++ b/java8/tasks/main.yml @@ -5,7 +5,7 @@ - name: install jessie-backports include_role: - name: apt-repositories + name: apt tasks_from: backports.yml when: ansible_distribution_release == "jessie" diff --git a/nginx/tasks/packages_jessie_backports.yml b/nginx/tasks/packages_jessie_backports.yml index e5d29f8a..703b9e2a 100644 --- a/nginx/tasks/packages_jessie_backports.yml +++ b/nginx/tasks/packages_jessie_backports.yml @@ -1,7 +1,7 @@ --- - include_role: - name: apt-repositories + name: apt tasks_from: backports.yml tags: - haproxy diff --git a/vrrpd/tasks/main.yml b/vrrpd/tasks/main.yml index ee1bad90..b4f9b118 100644 --- a/vrrpd/tasks/main.yml +++ b/vrrpd/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install Evolix public repositry include_role: - name: apt-repositories + name: apt tasks_from: evolix_public.yml - name: Install vrrpd packages