Cleanup tools

Fix #392
2024-05-13 15:46:15 +02:00 · 2021-08-25 18:01:46 +02:00 · 2021-08-25 18:01:46 +02:00 · 7da1e273fc
parent f7f7dda23d
commit 7da1e273fc
29 changed files with 9 additions and 87 deletions
--- 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 }
--- 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)
--- 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 }
--- 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"] }
--- 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 }
--- 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 }
--- 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 }
--- 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 }
--- 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 }
--- 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 }
--- 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 }
--- 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 }
--- 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'] }
--- 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 }
--- 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 }
--- 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 }
--- 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 }
--- 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 }
--- 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"] }
--- 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 }
--- 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 }
--- 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 }
--- 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 }
--- 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 }
--- 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"] }
--- 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 }
--- 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"] }
--- 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

--- 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