diff --git a/playbooks/accounts.archlinux.org.yml b/playbooks/accounts.archlinux.org.yml index 88d71412..a354925d 100644 --- a/playbooks/accounts.archlinux.org.yml +++ b/playbooks/accounts.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } - { role: sshd } diff --git a/playbooks/all-hosts-basic.yml b/playbooks/all-hosts-basic.yml index 61e3dfd3..ebe5001d 100644 --- a/playbooks/all-hosts-basic.yml +++ b/playbooks/all-hosts-basic.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } # reconfiguring sshd may break the AUR on luna (unchecked) diff --git a/playbooks/archive-mirrors.yml b/playbooks/archive-mirrors.yml index 946eadbc..dabc6ca2 100644 --- a/playbooks/archive-mirrors.yml +++ b/playbooks/archive-mirrors.yml @@ -4,7 +4,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } - { role: hardening } diff --git a/playbooks/archlinux.org.yml b/playbooks/archlinux.org.yml index b9c7d845..9b72b7be 100644 --- a/playbooks/archlinux.org.yml +++ b/playbooks/archlinux.org.yml @@ -15,7 +15,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: borg_client, tags: ["borg"] } diff --git a/playbooks/aur-dev.archlinux.org.yml b/playbooks/aur-dev.archlinux.org.yml index 968ca0ae..d2ad6600 100644 --- a/playbooks/aur-dev.archlinux.org.yml +++ b/playbooks/aur-dev.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: sshd, sshd_enable_includes: true } - { role: root_ssh } - { role: certbot } diff --git a/playbooks/aur.archlinux.org.yml b/playbooks/aur.archlinux.org.yml index 804297b1..5c313e94 100644 --- a/playbooks/aur.archlinux.org.yml +++ b/playbooks/aur.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: sshd, sshd_enable_includes: true } - { role: root_ssh } - { role: prometheus_exporters } diff --git a/playbooks/bbs.archlinux.org.yml b/playbooks/bbs.archlinux.org.yml index 85587db8..b4d42be3 100644 --- a/playbooks/bbs.archlinux.org.yml +++ b/playbooks/bbs.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: certbot } diff --git a/playbooks/bugs.archlinux.org.yml b/playbooks/bugs.archlinux.org.yml index faa377ab..af39d944 100644 --- a/playbooks/bugs.archlinux.org.yml +++ b/playbooks/bugs.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: certbot } diff --git a/playbooks/dashboards.archlinux.org.yml b/playbooks/dashboards.archlinux.org.yml index 4bc84c9d..3d744a09 100644 --- a/playbooks/dashboards.archlinux.org.yml +++ b/playbooks/dashboards.archlinux.org.yml @@ -5,7 +5,6 @@ - { role: firewalld } - { role: wireguard } - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: hardening } diff --git a/playbooks/gitlab.archlinux.org.yml b/playbooks/gitlab.archlinux.org.yml index 7979379e..b5847e39 100644 --- a/playbooks/gitlab.archlinux.org.yml +++ b/playbooks/gitlab.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } - { role: sshd } diff --git a/playbooks/homedir.archlinux.org.yml b/playbooks/homedir.archlinux.org.yml index f1d5294f..9ec5d97c 100644 --- a/playbooks/homedir.archlinux.org.yml +++ b/playbooks/homedir.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: certbot } diff --git a/playbooks/lists.archlinux.org.yml b/playbooks/lists.archlinux.org.yml index af2e515c..298aeb1d 100644 --- a/playbooks/lists.archlinux.org.yml +++ b/playbooks/lists.archlinux.org.yml @@ -5,7 +5,6 @@ - { role: common } - { role: firewalld } - { role: wireguard } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: hardening } diff --git a/playbooks/mail.archlinux.org.yml b/playbooks/mail.archlinux.org.yml index 36cad509..08ea63b0 100644 --- a/playbooks/mail.archlinux.org.yml +++ b/playbooks/mail.archlinux.org.yml @@ -3,7 +3,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: borg_client, tags: ['borg'] } diff --git a/playbooks/man.archlinux.org.yml b/playbooks/man.archlinux.org.yml index 22e5367b..6a1535e9 100644 --- a/playbooks/man.archlinux.org.yml +++ b/playbooks/man.archlinux.org.yml @@ -7,7 +7,6 @@ - { role: firewalld } - { role: wireguard } - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: hardening } diff --git a/playbooks/matrix.archlinux.org.yml b/playbooks/matrix.archlinux.org.yml index 98a6fc77..7d7f3da0 100644 --- a/playbooks/matrix.archlinux.org.yml +++ b/playbooks/matrix.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } - { role: sshd } diff --git a/playbooks/md.archlinux.org.yml b/playbooks/md.archlinux.org.yml index 497fe76f..565ece24 100644 --- a/playbooks/md.archlinux.org.yml +++ b/playbooks/md.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } - { role: sshd } diff --git a/playbooks/mirrors.yml b/playbooks/mirrors.yml index 632a0b6a..b3a7b61e 100644 --- a/playbooks/mirrors.yml +++ b/playbooks/mirrors.yml @@ -4,7 +4,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: certbot } diff --git a/playbooks/monitoring.archlinux.org.yml b/playbooks/monitoring.archlinux.org.yml index 121be67c..a4d4ebe8 100644 --- a/playbooks/monitoring.archlinux.org.yml +++ b/playbooks/monitoring.archlinux.org.yml @@ -5,7 +5,6 @@ - { role: firewalld } - { role: wireguard } - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: hardening } diff --git a/playbooks/patchwork.archlinux.org.yml b/playbooks/patchwork.archlinux.org.yml index 7c766c8a..c68ca5f5 100644 --- a/playbooks/patchwork.archlinux.org.yml +++ b/playbooks/patchwork.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: borg_client, tags: ["borg"] } diff --git a/playbooks/phrik.yml b/playbooks/phrik.yml index 55e4cc18..ac912955 100644 --- a/playbooks/phrik.yml +++ b/playbooks/phrik.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: archusers } - { role: bugbot } - { role: phrik } diff --git a/playbooks/quassel.archlinux.org.yml b/playbooks/quassel.archlinux.org.yml index d107e25f..7674a806 100644 --- a/playbooks/quassel.archlinux.org.yml +++ b/playbooks/quassel.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } - { role: sshd } diff --git a/playbooks/rebuilderd-workers.yml b/playbooks/rebuilderd-workers.yml index b1deff23..c92c0f27 100644 --- a/playbooks/rebuilderd-workers.yml +++ b/playbooks/rebuilderd-workers.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } - { role: sshd } diff --git a/playbooks/redirect.archlinux.org.yml b/playbooks/redirect.archlinux.org.yml index 873e2437..f2d15df7 100644 --- a/playbooks/redirect.archlinux.org.yml +++ b/playbooks/redirect.archlinux.org.yml @@ -3,7 +3,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } - { role: sshd } diff --git a/playbooks/reproducible.archlinux.org.yml b/playbooks/reproducible.archlinux.org.yml index e5462adb..6fe30895 100644 --- a/playbooks/reproducible.archlinux.org.yml +++ b/playbooks/reproducible.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } - { role: sshd } diff --git a/playbooks/security.archlinux.org.yml b/playbooks/security.archlinux.org.yml index 39821cef..74f13e91 100644 --- a/playbooks/security.archlinux.org.yml +++ b/playbooks/security.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: borg_client, tags: ["borg"] } diff --git a/playbooks/state.archlinux.org.yml b/playbooks/state.archlinux.org.yml index b0a4b68e..38def502 100644 --- a/playbooks/state.archlinux.org.yml +++ b/playbooks/state.archlinux.org.yml @@ -5,7 +5,6 @@ remote_user: root roles: - { role: common } - - { role: tools } - { role: firewalld } - { role: wireguard } - { role: sshd } diff --git a/playbooks/wiki.archlinux.org.yml b/playbooks/wiki.archlinux.org.yml index 543d3f2d..67fd9ed6 100644 --- a/playbooks/wiki.archlinux.org.yml +++ b/playbooks/wiki.archlinux.org.yml @@ -7,7 +7,6 @@ - { role: firewalld } - { role: wireguard } - { role: common } - - { role: tools } - { role: sshd } - { role: root_ssh } - { role: borg_client, tags: ["borg"] } diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 9dc76ec7..878866ba 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,5 +1,11 @@ --- +- name: install essential tools + pacman: name=vim,nano,tmux,htop,rsync,vnstat state=present + +- name: start and enable vnstatd + service: name=vnstat enabled=yes state=started + - name: install inetutils for hostname pacman: name=inetutils state=present diff --git a/roles/tools/tasks/main.yml b/roles/tools/tasks/main.yml index 9fb5e46b..b2cb7e45 100644 --- a/roles/tools/tasks/main.yml +++ b/roles/tools/tasks/main.yml @@ -1,67 +1,10 @@ -- name: install sysadmin tools - pacman: - state: present - name: - - lsof - - psmisc - - htop - - nethogs - - iftop - - rsync - - tmux - - mtr - - sshfs - - dfc - - tree - - dstat - - dmidecode - - net-tools - - ncdu - - nmap - - sysstat - - iptraf-ng - - vnstat - - screen - - tcpdump - - sudo - - glances - - cloud-utils - - name: install misc utils pacman: state: present name: - - zsh - - colordiff - - multitail - - httpie - - the_silver_searcher - - ripgrep - - ipcalc - - calc - - wget - - neovim - - python-pynvim - - vim - - parallel - bash-completion - - socat - - pv - - ccze - - rxvt-unicode-terminfo - - p7zip - - unzip - - setconf + - zsh - fish - - bat - - hexyl - - stow - - fzf - - fasd - - ranger - - vifm - git - - perl-term-readkey - -- name: start vnstatd - service: name=vnstat state=started enabled=true + - parallel + - nnn # Added for it's screen reader support