diff --git a/tasks/main.yml b/tasks/main.yml index 5703b93..5d7175e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,23 +25,6 @@ # cache_valid_time: 43200 # when: ansible_os_family == 'Debian' and ansible_distribution_version != '7' and ansible_distribution_release != 'wheezy' and ansible_machine != 'armv6l' -#- name: Install common base packages [all - wheezy] -# become: yes -# package: -# name: "{{ base_packages_extended }}" -# state: present -# when: -# - ansible_machine != 'armv6l' -# - ansible_distribution_release != 'wheezy' -# - ansible_architecture != 'armv7l' - -#- name: Install extended base packages [all - wheezy - rpi] -# become: yes -# package: -# name: "{{ base_packages }}" -# state: present -# when: ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - #-# name: Install common base packages [Fedora] # become: yes diff --git a/tasks/packages.yml b/tasks/packages.yml index 315151c..1d35d0e 100644 --- a/tasks/packages.yml +++ b/tasks/packages.yml @@ -15,3 +15,12 @@ ansible_os_family == 'RedHat' and ansible_distribution_version | float >= "7" or ansible_distribution == 'Debian' and ansible_distribution_version | float >= 8 or ansible_os_family == 'Archlinux' + +- name: install packages for all non-legacy Debian/Ububntu systems + become: true + package: + name: "{{ base__debian_packages }}" + state: "{{ base__package_state }}" + when: | + ansible_distribution == 'Ubuntu' and ansible_distribution_version | float >= "16.0" or + ansible_distribution == 'Debian' and ansible_distribution_version | float >= 8 diff --git a/vars/main.yml b/vars/main.yml index c6b602f..b7f0fa3 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -23,7 +23,8 @@ base__modern_packages: - smartmontools -debian_packages: +# debian/ubuntu packages +base__debian_packages: - debian-goodies - molly-guard - mtr-tiny @@ -33,9 +34,8 @@ debian_packages: - apt-transport-https - aptitude - python3-setuptools -#non_legacy_debian_packages: - - python-apt - python3-apt + - dnsutils packages_for_all_except_rhel: - ranger @@ -60,5 +60,5 @@ fedora_packages: - python3-pip - python3 -playbook_version_number: 8981 # should be over ninethousand +playbook_version_number: 8998 # should be over ninethousand playbook_version_path: 'base-packages_roles-ansible_github.version'