mirror of
https://github.com/telekom-security/tpotce.git
synced 2025-07-01 20:42:11 +00:00
Fixes #1525
Ubuntu 24.04 switched from exa to eza and the new install playbook reflects these changes.
This commit is contained in:
parent
74a3f375e2
commit
5815664417
1 changed files with 56 additions and 3 deletions
|
@ -129,7 +129,6 @@
|
||||||
- cracklib-runtime
|
- cracklib-runtime
|
||||||
- cron
|
- cron
|
||||||
- curl
|
- curl
|
||||||
- exa
|
|
||||||
- git
|
- git
|
||||||
- gnupg
|
- gnupg
|
||||||
- grc
|
- grc
|
||||||
|
@ -146,6 +145,32 @@
|
||||||
- "Raspbian"
|
- "Raspbian"
|
||||||
- "Ubuntu"
|
- "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)
|
- name: Install grc from remote repo (AlmaLinux, Rocky)
|
||||||
ansible.builtin.dnf:
|
ansible.builtin.dnf:
|
||||||
name: 'https://github.com/kriipke/grc/releases/download/1.13.8/grc-1.13.8-1.el7.noarch.rpm'
|
name: 'https://github.com/kriipke/grc/releases/download/1.13.8/grc-1.13.8-1.el7.noarch.rpm'
|
||||||
|
@ -674,7 +699,7 @@
|
||||||
when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
|
when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
|
||||||
failed_when: ansible_user_id == "root"
|
failed_when: ansible_user_id == "root"
|
||||||
|
|
||||||
- name: Add aliases (All)
|
- name: Add aliases with exa (All)
|
||||||
blockinfile:
|
blockinfile:
|
||||||
path: ~/.bashrc
|
path: ~/.bashrc
|
||||||
block: |
|
block: |
|
||||||
|
@ -688,7 +713,35 @@
|
||||||
marker: "# {mark} ANSIBLE MANAGED BLOCK"
|
marker: "# {mark} ANSIBLE MANAGED BLOCK"
|
||||||
insertafter: EOF
|
insertafter: EOF
|
||||||
state: present
|
state: present
|
||||||
when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
|
when: exa_install_result is succeeded and ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
|
||||||
|
tags:
|
||||||
|
- "AlmaLinux"
|
||||||
|
- "Debian"
|
||||||
|
- "Fedora"
|
||||||
|
- "openSUSE Tumbleweed"
|
||||||
|
- "Raspbian"
|
||||||
|
- "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)
|
- name: Clone / Update T-Pot repository (All)
|
||||||
git:
|
git:
|
||||||
|
|
Loading…
Reference in a new issue