Added a better structure for defaults in os_configuration role

nova/core/roles/os_configuration/defaults/main.yml

@@ -1,10 +1,10 @@
 ---
-kms_server: {}
-extra_activation_command: {} # Extra PowerShell command to be ran before Windows/Office activation, usually not needed
-infra_env: {}
-post_scripts_folder_on_target: c:\tmp
-routeros_license_account: {} # MikroTik account to be used for license activation
-routeros_license_password: {} # MikroTik account password to be used for license activation
+###########
+# General #
+###########
+
+os_configuration_post_roles: [] # List of extra roles to be included as one of the last steps of this role
+install_trusted_certificates: true # Set to false to skip trusted certificates installation with nova.core.trusted_certificates role
 hosts_file_values: [] # Custom hosts file entries to be added.
 resolv_conf_dns_servers: []
 wait_for_host: false # Set true to wait for external connection before moving on
@@ -15,16 +15,38 @@ os_configuration_wait_for_site: false # Set true to wait for site defined in os_
 os_configuration_wait_for_site_url: https://google.com # URL to wait for
 os_configuration_wait_for_site_retries: 30 # How many times to retry waiting for site defined in os_configuration_wait_for_site_url respond with HTTP 200 before moving on with Linux hosts
 os_configuration_expand_os_disk_role_name: {} # Define your OS disk expansion role name in your host or group vars to included it with this role
-fortios_access_token: {} # Required token to configure FortiOS
-os_configuration_post_roles: [] # List of extra roles to be included as one of the last steps of this role
-install_trusted_certificates: true # Set to false to skip trusted certificates installation with nova.core.trusted_certificates role
-
+infra_env: {}
 ntp_servers:
   - "0.pool.ntp.org"
   - "1.pool.ntp.org"
 
-# PfSense
+###########
+# Windows #
+###########
+
+kms_server: {}
+extra_activation_command: {} # Extra PowerShell command to be ran before Windows/Office activation, usually not needed
+post_scripts_folder_on_target: c:\tmp
+
+###########
+# FortiOS #
+###########
+
+fortios_access_token: {} # Required token to configure FortiOS
+
+############
+# RouterOS #
+############
+
+routeros_license_account: {} # MikroTik account to be used for license activation
+routeros_license_password: {} # MikroTik account password to be used for license activation
+
+###########
+# PfSense #
+###########
+
 os_configuration_pfsense_console_menu_password: true # Set to false to disable console menu password protection
+
 ######################
 # VMware Workstation #
 ######################

nova/core/roles/os_configuration/tasks/linux_cloud.yml

@@ -64,7 +64,7 @@
     update_cache: true
   when: ansible_distribution == "Kali"
 
-- name: Incluing XRDP roles...
+- name: Including XRDP roles...
   ansible.builtin.include_role:
     name: "{{ item }}"
   loop: