Merge pull request #170 from cisagov/lineage/skeleton

⚠️ CONFLICT! Lineage pull request for: skeleton

requirements.txt

@@ -20,7 +20,11 @@ ansible>=8,<10
 # ansible/ansible#82702, which breaks any symlinked files in vars,
 # tasks, etc. for any Ansible role installed via ansible-galaxy.
 #
-# See also cisagov/skeleton-ansible-role#178.
+# See also cisagov/skeleton-ansible-role#178 and
+# cisagov/skeleton-generic#180.  Note from these PRs that any changes
+# made to this dependency must also be made in requirements-test.txt
+# in cisagov/skeleton-ansible-role and .pre-commit-config.yaml in
+# cisagov/skeleton-generic.
 ansible-core<2.16.3
 boto3
 docopt

src/assessor_tools.yml

@@ -692,11 +692,6 @@
     - name: Install CrackMapExec
       ansible.builtin.import_tasks: crackmapexec.yml
 
-    # dns-profile-randomizer lives in a private GitLab repository and
-    # hence must be downloaded using a GitLab access token.
-    - name: Install dns-profile-randomizer
-      ansible.builtin.import_tasks: dns_profile_randomizer.yml
-
     - name: Install Donut
       ansible.builtin.import_tasks: donut.yml
 

src/base.yml

@@ -24,3 +24,9 @@
     - name: Configure JournalD to preserve logs across reboots
       ansible.builtin.include_role:
         name: persist_journald
+    # Kali by default uses NetworkManager instead of systemd-networkd,
+    # so it doesn't make sense to install systemd-resolved on this
+    # platform.
+    # - name: Install and configure systemd-resolved
+    #   ansible.builtin.include_role:
+    #     name: systemd_resolved

src/cobalt_strike.yml

@@ -1,9 +1,4 @@
 ---
-# The assessors like to use Thunderbird with Cobalt Strike
-- name: Install Thunderbird mail client
-  ansible.builtin.package:
-    name: thunderbird
-
 - name: Install Cobalt Strike
   ansible.builtin.include_role:
     name: cobalt_strike

src/requirements.yml

@@ -44,6 +44,11 @@ roles:
     src: https://github.com/cisagov/ansible-role-remove-python2
   - name: server_setup
     src: https://github.com/cisagov/ansible-role-server-setup
+  # Kali by default uses NetworkManager instead of systemd-networkd,
+  # so it doesn't make sense to install systemd-resolved on this
+  # platform.
+  # - name: systemd_resolved
+  #   src: https://github.com/cisagov/ansible-role-systemd-resolved
   - name: ufw
     src: https://github.com/cisagov/ansible-role-ufw
   - name: upgrade

src/version.txt

@@ -1 +1 @@
-__version__ = "0.5.26"
+__version__ = "0.5.27"