From 274b434653064ae7a823ca198d4fddbfa1eab4ed Mon Sep 17 00:00:00 2001 From: nd Date: Tue, 17 Aug 2021 02:35:02 +0200 Subject: [PATCH 1/6] fix packages for debian bullseye --- vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/main.yml b/vars/main.yml index fc6e576..6d5edd3 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -3,7 +3,7 @@ packages: pkg: aptitude: {} "apt-transport-https": {} - bsdtar: {} + "libarchive-tools": {} bzip2: {} curl: {} dnsutils: {} From 1f76ae76e770dc6946aaa17c4fd539d73739b04a Mon Sep 17 00:00:00 2001 From: nd Date: Sat, 25 Sep 2021 16:35:09 +0200 Subject: [PATCH 2/6] fix backport repo --- defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 157c642..84db4c5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -8,7 +8,7 @@ default_repos: security: url: "deb https://security.debian.org/debian-security {{ ansible_distribution_release|lower }}-security main contrib non-free" backports: - url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main" + url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free" buster: debian: url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }} main contrib non-free" @@ -17,6 +17,6 @@ default_repos: security: url: "deb http://deb.debian.org/debian-security/ {{ ansible_distribution_release|lower }}/updates main contrib non-free" backports: - url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main" + url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free" From 1522ec5fb3865f9eb084cd710d5f527fdda24c35 Mon Sep 17 00:00:00 2001 From: nd Date: Thu, 14 Oct 2021 19:39:39 +0200 Subject: [PATCH 3/6] added zip/unzip packages --- vars/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vars/main.yml b/vars/main.yml index b84ed19..0474326 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -36,9 +36,11 @@ packages: tcpdump: {} tmux: {} tree: {} + unzip: {} usbutils: {} "vim": {} vnstat: {} "xz-utils": {} + zip: {} zsh: {} repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}" From 92f3499bfe9671914a04f7f69a2e9df634555f42 Mon Sep 17 00:00:00 2001 From: Morre Date: Fri, 15 Oct 2021 15:22:31 +0200 Subject: [PATCH 4/6] remove sources.list.d file as we always set sources explicitly --- tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index d3ef024..958215f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -36,3 +36,8 @@ community.general.alternatives: name: editor path: /usr/bin/vim.basic + +- name: remove /etc/apt/sources.list + file: + path: /etc/apt/sources.list + state: absent From e82073f38a09233ef498d2feb78189a968c7467d Mon Sep 17 00:00:00 2001 From: nd Date: Thu, 21 Oct 2021 14:38:00 +0200 Subject: [PATCH 5/6] add support for raspbian --- defaults/main.yml | 3 +++ vars/main.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 84db4c5..ab994e6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -18,5 +18,8 @@ default_repos: url: "deb http://deb.debian.org/debian-security/ {{ ansible_distribution_release|lower }}/updates main contrib non-free" backports: url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free" + raspbian: + bullseye: {} + buster: {} diff --git a/vars/main.yml b/vars/main.yml index b84ed19..e103944 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -41,4 +41,4 @@ packages: vnstat: {} "xz-utils": {} zsh: {} - repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}" + repos: "{{ default_repos[ansible_lsb.id|lower][ansible_lsb.codename|lower] }}" From a13d0c244f54c218e2c438c36b960d7392dffb20 Mon Sep 17 00:00:00 2001 From: nd Date: Thu, 2 Dec 2021 18:10:43 +0100 Subject: [PATCH 6/6] break inventory overrides less --- defaults/main.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++- meta/main.yml | 2 -- tasks/main.yml | 8 ++++++++ vars/main.yml | 46 --------------------------------------------- 4 files changed, 55 insertions(+), 49 deletions(-) delete mode 100644 meta/main.yml delete mode 100644 vars/main.yml diff --git a/defaults/main.yml b/defaults/main.yml index 157c642..9d16424 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 7574daa..0000000 --- a/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- { role: packages } diff --git a/tasks/main.yml b/tasks/main.yml index 958215f..8957ada 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 0474326..0000000 --- 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] }}"