From 6cda0fefe5b590e8da5a1f3b57b0edcced364c1c Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Mon, 3 Feb 2025 11:54:03 +0100 Subject: [PATCH] Remove exa / eza and it aliases - fixes #1752 --- installer/install/tpot.yml | 59 ++------------------------------------ 1 file changed, 2 insertions(+), 57 deletions(-) diff --git a/installer/install/tpot.yml b/installer/install/tpot.yml index 37cdadde..e4de97a4 100644 --- a/installer/install/tpot.yml +++ b/installer/install/tpot.yml @@ -145,32 +145,6 @@ - "Raspbian" - "Ubuntu" - - name: Install exa (Debian, Raspbian, Ubuntu) - package: - name: - - exa - state: latest - update_cache: yes - register: exa_install_result - ignore_errors: yes - when: ansible_distribution in ["Debian", "Raspbian", "Ubuntu"] - tags: - - "Debian" - - "Raspbian" - - "Ubuntu" - - - name: Install eza (if exa failed) - package: - name: - - eza - state: latest - update_cache: yes - when: exa_install_result is failed - tags: - - "Debian" - - "Raspbian" - - "Ubuntu" - - name: Install grc from remote repo (AlmaLinux, Rocky) ansible.builtin.dnf: name: 'https://github.com/kriipke/grc/releases/download/1.13.8/grc-1.13.8-1.el7.noarch.rpm' @@ -189,7 +163,6 @@ - cracklib - curl - dnf-plugins-core - - exa - git - grc - htop @@ -200,7 +173,6 @@ - wget state: latest update_cache: yes - register: exa_install_result when: ansible_distribution in ["AlmaLinux", "Rocky"] tags: - "AlmaLinux" @@ -225,7 +197,6 @@ - cronie - curl - dnf-plugins-core - - exa - git - grc - htop @@ -236,7 +207,6 @@ - wget state: latest update_cache: yes - register: exa_install_result when: ansible_distribution in ["Fedora"] tags: - "Fedora" @@ -264,7 +234,6 @@ - ca-certificates - cracklib - curl - - exa - git - grc - htop @@ -272,7 +241,6 @@ - wget state: latest update_cache: yes - register: exa_install_result when: ansible_distribution in ["openSUSE Tumbleweed"] tags: - "openSUSE Tumbleweed" @@ -729,7 +697,7 @@ when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"] failed_when: ansible_user_id == "root" - - name: Add aliases with exa (All) + - name: Add aliases (All) blockinfile: path: ~/.bashrc block: | @@ -737,13 +705,10 @@ alias dpsw='watch -c bash -ic dps' alias mi='micro' alias sudo='sudo ' - alias ls='exa' - alias ll='exa -hlg' - alias la='exa -hlag' marker: "# {mark} ANSIBLE MANAGED BLOCK" insertafter: EOF state: present - when: exa_install_result is succeeded and ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"] + when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"] tags: - "AlmaLinux" - "Debian" @@ -753,26 +718,6 @@ - "Rocky" - "Ubuntu" - - name: Add aliases with eza (Debian, Raspbian, Ubuntu) - blockinfile: - path: ~/.bashrc - block: | - alias dps='grc --colour=on docker ps -f status=running -f status=exited --format "table {{'{{'}}.Names{{'}}'}}\\t{{'{{'}}.Status{{'}}'}}\\t{{'{{'}}.Ports{{'}}'}}" | sort' - alias dpsw='watch -c bash -ic dps' - alias mi='micro' - alias sudo='sudo ' - alias ls='eza' - alias ll='eza -hlg' - alias la='eza -hlag' - marker: "# {mark} ANSIBLE MANAGED BLOCK" - insertafter: EOF - state: present - when: exa_install_result is failed and ansible_distribution in ["Debian", "Raspbian", "Ubuntu"] - tags: - - "Debian" - - "Raspbian" - - "Ubuntu" - - name: Clone / Update T-Pot repository (All) git: repo: 'https://github.com/telekom-security/tpotce'