Merge https://github.com/cisagov/skeleton-packer into lineage/skeleton

# Conflicts:
#	ansible/playbook.yml
#	ansible/requirements.yml
#	requirements.txt
#	terraform-build-user/main.tf
#	version.txt

Author: jsf9k

.github/workflows/build.yml

@@ -33,7 +33,7 @@ env:
   PIP_CACHE_DIR: ~/.cache/pip
   PRE_COMMIT_CACHE_DIR: ~/.cache/pre-commit
   RUN_TMATE: ${{ secrets.RUN_TMATE }}
-  TERRAFORM_DOCS_REPO_BRANCH_NAME: improvement/support_atx_closed_markdown_headers
+  TERRAFORM_DOCS_REPO_BRANCH_NAME: cisagov
   TERRAFORM_DOCS_REPO_DEPTH: 1
   TERRAFORM_DOCS_REPO_URL: https://github.com/mcdonnnj/terraform-docs.git
 
@@ -181,10 +181,13 @@ jobs:
           PACKAGE_VERSION: ${{ steps.setup-env.outputs.staticcheck-version }}
         run: go install ${PACKAGE_URL}@${PACKAGE_VERSION}
       # TODO: https://github.com/cisagov/skeleton-generic/issues/165
-      # We are temporarily using @mcdonnnj's forked branch of terraform-docs
-      # until his PR: https://github.com/terraform-docs/terraform-docs/pull/745
-      # is approved. This temporary fix will allow for ATX header support when
-      # terraform-docs is run during linting.
+      # We are temporarily using a branch of @mcdonnnj's fork of terraform-docs that
+      # groups changes from his PRs until they are approved and merged:
+      # https://github.com/terraform-docs/terraform-docs/pull/745
+      # https://github.com/terraform-docs/terraform-docs/pull/901
+      # This temporary fix will allow for ATX header support when terraform-docs is run
+      # during linting and output delimiter rows with cell spacing that passes
+      # Markdownlint's MD060/table-column-style rule.
       - name: Clone ATX headers branch from terraform-docs fork
         run: |
           git clone \

ansible/base.yml

@@ -16,7 +16,7 @@
     - name: Install and configure htop
       ansible.builtin.include_role:
         name: htop
-    - name: Configure JournalD to preserve logs across reboots
+    - name: Configure journald to preserve logs across reboots
       ansible.builtin.include_role:
         name: persist_journald
     - name: Install and configure systemd-resolved

ansible/playbook.yml

@@ -15,6 +15,7 @@
 - name: Import UFW playbook
   ansible.builtin.import_playbook: ufw.yml
 
+<<<<<<< HEAD
 - name: Import Docker playbook
   ansible.builtin.import_playbook: docker.yml
 
@@ -30,3 +31,10 @@
 # a user created in the VNC playbook.
 - name: Import Xfce playbook
   ansible.builtin.import_playbook: xfce.yml
+=======
+- name: Import Wazuh agent playbook
+  ansible.builtin.import_playbook: wazuh_agent.yml
+
+- name: Import Example playbook
+  ansible.builtin.import_playbook: example.yml
+>>>>>>> bd454b309193f70eba361285bbd30328e8ba35eb

ansible/requirements.yml

@@ -33,7 +33,12 @@
   src: https://github.com/cisagov/ansible-role-ufw
 - name: upgrade
   src: https://github.com/cisagov/ansible-role-upgrade
+<<<<<<< HEAD
 - name: vnc_server
   src: https://github.com/cisagov/ansible-role-vnc-server
 - name: xfce_cool
   src: https://github.com/cisagov/ansible-role-xfce-cool
+=======
+- name: wazuh_agent
+  src: https://github.com/cisagov/ansible-role-wazuh-agent
+>>>>>>> bd454b309193f70eba361285bbd30328e8ba35eb

ansible/wazuh_agent.yml

@@ -0,0 +1,13 @@
+---
+- name: Setup Wazuh agent
+  hosts: all
+  become: true
+  become_method: ansible.builtin.sudo
+  tasks:
+    - name: Install and configure Wazuh agent
+      ansible.builtin.include_role:
+        name: wazuh_agent
+      vars:
+        # The IP or hostname of the Wazuh manager
+        wazuh_agent_manager: >-
+          {{ lookup('amazon.aws.aws_ssm', '/wazuh_agent/manager') }}

requirements.txt

@@ -14,10 +14,18 @@ ansible>=10,<11
 # .pre-commit-config.yaml in cisagov/skeleton-generic.
 ansible-core>=2.17.7
 # Required because we are using the amazon.aws.aws_ssm Ansible lookup
+<<<<<<< HEAD
 # plugin to pull parameter values from AWS Parameter Store.
 boto3
 # Required because we are using the community.general.json_query filter in our Ansible
 # code in the cisagov/ansible-role-amazon-efs-utils role:
+=======
+# plugin to pull parameters value from AWS Parameter Store.
+boto3
+# Required because we are using the community.general.json_query
+# filter in our Ansible code in the
+# cisagov/ansible-role-amazon-efs-utils role:
+>>>>>>> bd454b309193f70eba361285bbd30328e8ba35eb
 # https://docs.ansible.com/projects/ansible/latest/collections/community/general/json_query_filter.html
 jmespath
 # The bump-version script requires at least version 3 of semver.

terraform-build-user/.terraform.lock.hcl

@@ -8,10 +8,20 @@ module "iam_user" {
   }
 
   ssm_parameters = [
+<<<<<<< HEAD
     "/vnc/username",
     "/vnc/password",
     "/vnc/ssh/ed25519_public_key",
     "/vnc/ssh/ed25519_private_key",
+=======
+    "/cyhy/dev/users",
+    "/ssh/public_keys/*",
+    # Any Packer AMIs that require access to the third-party bucket
+    # will also require access to this SSM Parameter Store parameter.
+    # "/third_party_bucket_name",
+    # Necessary when building any instances that run the Wazuh agent
+    "/wazuh_agent/manager",
+>>>>>>> bd454b309193f70eba361285bbd30328e8ba35eb
   ]
   user_name = "build-docker-packer"
 }

terraform-build-user/main.tf

@@ -1 +1,5 @@
+<<<<<<< HEAD
 1.0.1
+=======
+3.1.0
+>>>>>>> bd454b309193f70eba361285bbd30328e8ba35eb