diff --git a/.github/workflows/distro_tests.yml b/.github/workflows/distro_tests.yml index 0d0515ac2..957847a65 100644 --- a/.github/workflows/distro_tests.yml +++ b/.github/workflows/distro_tests.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04", "debian", "archlinux", "fedora", "gentoo/python", "python:3.10-alpine", "kalilinux/kali-rolling", "parrotsec/security"] + os: ["ubuntu:22.04", "ubuntu:24.04", "debian", "archlinux", "fedora", "gentoo/python", "python:3.10-alpine", "kalilinux/kali-rolling", "parrotsec/security"] steps: - uses: actions/checkout@v4 - name: Install Python and Poetry diff --git a/bbot/modules/wpscan.py b/bbot/modules/wpscan.py index c276c738f..980d24fb5 100644 --- a/bbot/modules/wpscan.py +++ b/bbot/modules/wpscan.py @@ -33,22 +33,10 @@ class wpscan(BaseModule): deps_apt = ["curl", "make", "gcc"] deps_ansible = [ { - "name": "Install Ruby Deps (Ubuntu 20.04)", - "package": {"name": ["ruby-dev"], "state": "present"}, - "become": True, - "when": "ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_major_version'] == '20'", - }, - { - "name": "Update RubyGems System (Ubuntu 20.04)", - "command": "gem update --system", - "become": True, - "when": "ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_major_version'] == '20'", - }, - { - "name": "Install Ruby Deps (Other Debian-based)", + "name": "Install Ruby Deps (Debian)", "package": {"name": ["ruby-rubygems", "ruby-dev"], "state": "present"}, "become": True, - "when": "ansible_facts['os_family'] == 'Debian' and not (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_major_version'] == '20')", + "when": "ansible_facts['os_family'] == 'Debian'", }, { "name": "Install Ruby Deps (Arch)",