Merge pull request #48 from ansible-lockdown/empty_lines

Removed multiple blank lines

.github/workflows/main.tf

@@ -5,7 +5,6 @@ provider "aws" {
 
 // Create a security group with access to port 22 and port 80 open to serve HTTP traffic
 
-
 resource "random_id" "server" {
   keepers = {
     # Generate a new id each time we switch to a new AMI id

.yamllint

@@ -1,33 +1,25 @@
 ---
+# Based on ansible-lint config
 extends: default
 
-ignore: |
-    tests/
-    molecule/
-    .github/
-    .gitlab-ci.yml
-    *molecule.yml
-
 rules:
+  braces: {max-spaces-inside: 1, level: error}
+  brackets: {max-spaces-inside: 1, level: error}
+  colons: {max-spaces-after: -1, level: error}
+  commas: {max-spaces-after: -1, level: error}
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines: {max: 3, level: error}
+  hyphens: {level: error}
   indentation:
      # Requiring 4 space indentation
      spaces: 4
      # Requiring consistent indentation within a file, either indented or not
      indent-sequences: consistent
-    braces:
-        max-spaces-inside: 1
-        level: error
-    brackets:
-        max-spaces-inside: 1
-        level: error
-    empty-lines:
-        max: 1
-    line-length: disable
   key-duplicates: enable
-    new-line-at-end-of-file: enable
+  line-length: disable
-    new-lines:
+  new-line-at-end-of-file: disable
-        type: unix
+  new-lines: {type: unix}
-    trailing-spaces: enable
+  trailing-spaces: disable
-    truthy:
+  truthy: disable
-        allowed-values: ['true', 'false']
-        check-keys: false

CONTRIBUTING.rst

@@ -61,7 +61,6 @@ following text in your contribution commit message:
 
 ::
 
-
 This message can be entered manually, or if you have configured git
 with the correct `user.name` and `user.email`, you can use the `-s`
 option to `git commit` to automatically include the signoff message.

Changelog.md

@@ -1,5 +1,10 @@
 # Changes to rhel9CIS
 
+## 1.0.6
+
+updated ymlalint as galaxy doenst honouyr local settings
+removed empty lines in files
+
 ## 1.0.5
 
 updated yamllint

Makefile

@@ -1,6 +1,5 @@
 .PHONY: all help galaxy-install ansible-list yamllint pip-requirements
 
-
 GALAXY=ansible-galaxy
 ANSIBLE_LINT='/usr/local/bin/ansible-lint'
 ANSIBLE_FILE=site.yml
@@ -15,7 +14,6 @@ help:
 	@echo "    yamllint                           to lint playbook files"
 	@echo "    pip-requirements                   add pip required file"
 
-
 galaxy-install:
 	$(GALAXY) install -r ./collections/requirements.yml
 
@@ -29,4 +27,3 @@ pip-requirements:
 	@echo 'Python dependencies:'
 	@cat requirements.txt
 	pip3 install -r requirements.txt
-

ansible.cfg

@@ -12,7 +12,6 @@ stdout_callback = yaml
 # Use the stdout_callback when running ad-hoc commands.
 bin_ansible_callbacks = True
 
-
 [privilege_escalation]
 
 [paramiko_connection]

molecule/default/molecule.yml

@@ -31,4 +31,3 @@ lint: |
 
 verifier:
     name: ansible
-

molecule/localhost/converge.yml

@@ -15,4 +15,3 @@
       - name: "Include tasks"
         ansible.builtin.include_role:
             name: "{{ role_name }}"
-

molecule/localhost/molecule.yml

@@ -27,4 +27,3 @@ lint: |
 
 verifier:
     name: ansible
-

molecule/wsl/converge.yml

@@ -24,4 +24,3 @@
       - name: "Include tasks"
         ansible.builtin.include_role:
             name: "{{ role_name }}"
-

molecule/wsl/molecule.yml

@@ -26,4 +26,3 @@ lint: |
 
 verifier:
     name: ansible
-

templates/ansible_vars_goss.yml.j2

@@ -9,7 +9,6 @@ benchmark_version: '1.0.0'
 # If run via script this is discovered and set
 host_os_distribution: {{ ansible_distribution | lower }}
 
-
 #  timeout for each command to run where set - default = 10seconds/10000ms
 timeout_ms: 60000
 
@@ -127,7 +126,6 @@ rhel9cis_rule_1_9: {{ rhel9cis_rule_1_9 }}
 # Ensure system-wide crypto policy is not legacy
 rhel9cis_rule_1_10: {{ rhel9cis_rule_1_10 }}
 
-
 # section 2
 # Services
 # 2.1 Time Synchronization
@@ -191,7 +189,6 @@ rhel9cis_rule_3_4_2_5: {{ rhel9cis_rule_3_4_2_5 }}
 rhel9cis_rule_3_4_2_6: {{ rhel9cis_rule_3_4_2_6 }}
 rhel9cis_rule_3_4_2_7: {{ rhel9cis_rule_3_4_2_7 }}
 
-
 #  Section 4 rules
 # 4.1 Configure System Accounting
 rhel9cis_rule_4_1_1_1: {{ rhel9cis_rule_4_1_1_1 }}
@@ -265,7 +262,6 @@ rhel9cis_rule_4_2_3: {{ rhel9cis_rule_4_2_3 }}
 # 4.3 Logrotate
 rhel9cis_rule_4_3: {{ rhel9cis_rule_4_3 }}
 
-
 # Section 5
 #  Authentication and Authorization
 # 5.1 Configure time-based job schedulers
@@ -450,7 +446,6 @@ rhel9cis_nft_tables_autonewtable: {{ rhel9cis_nft_tables_autonewtable }}
 rhel9cis_nft_tables_tablename: {{ rhel9cis_nft_tables_tablename }}
 rhel9cis_nft_tables_autochaincreate: {{ rhel9cis_nft_tables_autochaincreate }}
 
-
 # Section 4
 
 ## Set if host is a logserver
@@ -486,7 +481,6 @@ rhel9cis_authselect:
   custom_profile_name: {{ rhel9cis_authselect['custom_profile_name'] }}
   default_file_to_copy: {{ rhel9cis_authselect['default_file_to_copy'] }}
 
-
 ## 5.4.1 Enable automation to create custom profile settings, using the setings above
 rhel9cis_authselect_custom_profile_create: {{ rhel9cis_authselect_custom_profile_create }}
 

templates/etc/dconf/db/00-screensaver.j2

@@ -2,7 +2,6 @@
 # Added as part of ansible-lockdown CIS baseline 
 # provided by MindPointGroup LLC
 
-
 # Specify the dconf path
 [org/gnome/desktop/session]
 

templates/etc/sysctl.d/60-kernel_sysctl.conf.j2

@@ -1,6 +1,5 @@
 ## This file is managed by Ansible, YOUR CHANGES WILL BE LOST!
 
-
 {% if rhel9cis_rule_1_5_3 %}
 # Kernel sysctl
 # CIS 1.5.3