diff --git a/defaults/main.yml b/defaults/main.yml index 157c64204a707dc79d509b10620a00779a13c207..9d164244c2e5cc2abe48ac88c3469206f5931187 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,4 +19,50 @@ default_repos: backports: url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main" - +default_packages: + debian: + bullseye: &debian_packages + aptitude: {} + "apt-transport-https": {} + "libarchive-tools": {} + bzip2: {} + curl: {} + dnsutils: {} + file: {} + git: {} + haveged: {} + htop: {} + iftop: {} + iotop: {} + less: {} + "locales-all": {} + lsof: {} + mailutils: {} + members: {} + mksh: {} + "molly-guard": {} + mosh: {} + "mtr-tiny": {} + ncdu: {} + "ncurses-term": {} + "net-tools": {} + nmap: {} + pciutils: {} + pv: {} + python3: {} + rsync: {} + screen: {} + sshfs: {} + sudo: {} + sysstat: {} + tcpdump: {} + tmux: {} + tree: {} + unzip: {} + usbutils: {} + "vim": {} + vnstat: {} + "xz-utils": {} + zip: {} + zsh: {} + buster: *debian_packages diff --git a/meta/main.yml b/meta/main.yml deleted file mode 100644 index 7574daa2964fd23808321cbebaa51d7d2d020e7c..0000000000000000000000000000000000000000 --- a/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- { role: packages } diff --git a/tasks/main.yml b/tasks/main.yml index 958215f4624d648e7c53ffb53baec82ee7845bbf..8957ada07f497e219964ffb4427fc753130d8f2a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,12 @@ --- +- name: install default packages and repos + include_role: + name: packages + vars: + packages: + pkg: "{{ default_packages[ansible_distribution|lower][ansible_distribution_release|lower] }}" + repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}" + - name: copy environment copy: src: dotfiles/environment diff --git a/vars/main.yml b/vars/main.yml deleted file mode 100644 index 0474326cdd58cfbd4bdf77aef351cdb3f0e8e2db..0000000000000000000000000000000000000000 --- a/vars/main.yml +++ /dev/null @@ -1,46 +0,0 @@ -packages: - pkg: - aptitude: {} - "apt-transport-https": {} - "libarchive-tools": {} - bzip2: {} - curl: {} - dnsutils: {} - file: {} - git: {} - haveged: {} - htop: {} - iftop: {} - iotop: {} - less: {} - "locales-all": {} - lsof: {} - mailutils: {} - members: {} - mksh: {} - "molly-guard": {} - mosh: {} - "mtr-tiny": {} - ncdu: {} - "ncurses-term": {} - "net-tools": {} - nmap: {} - pciutils: {} - pv: {} - python3: {} - rsync: {} - screen: {} - sshfs: {} - sudo: {} - sysstat: {} - tcpdump: {} - tmux: {} - tree: {} - unzip: {} - usbutils: {} - "vim": {} - vnstat: {} - "xz-utils": {} - zip: {} - zsh: {} - repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}"