From 5f7dd0883822c522d111392f8f7870dd781655f3 Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Tue, 21 Mar 2023 16:46:19 +0000 Subject: [PATCH] Removed multiple blank lines Signed-off-by: Mark Bolwell --- .github/workflows/main.tf | 1 - .yamllint | 4 ++-- CONTRIBUTING.rst | 1 - Makefile | 3 --- ansible.cfg | 1 - molecule/localhost/converge.yml | 1 - molecule/localhost/molecule.yml | 1 - molecule/wsl/converge.yml | 1 - molecule/wsl/molecule.yml | 1 - templates/ansible_vars_goss.yml.j2 | 6 ------ templates/etc/dconf/db/00-screensaver.j2 | 1 - templates/etc/sysctl.d/60-kernel_sysctl.conf.j2 | 3 +-- 12 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.github/workflows/main.tf b/.github/workflows/main.tf index 516d5cc..c877665 100644 --- a/.github/workflows/main.tf +++ b/.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 diff --git a/.yamllint b/.yamllint index ec46929..cd5533e 100644 --- a/.yamllint +++ b/.yamllint @@ -3,8 +3,8 @@ extends: default ignore: | tests/ - molecule/ - .github/ + molecule + .github .gitlab-ci.yml *molecule.yml diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 23ce2fb..13e0b49 100644 --- a/CONTRIBUTING.rst +++ b/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. diff --git a/Makefile b/Makefile index 5d7a9b3..c39a283 100755 --- a/Makefile +++ b/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 - diff --git a/ansible.cfg b/ansible.cfg index 3bc6e07..8b5bba7 100644 --- a/ansible.cfg +++ b/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] diff --git a/molecule/localhost/converge.yml b/molecule/localhost/converge.yml index 6dadcfc..99e344b 100644 --- a/molecule/localhost/converge.yml +++ b/molecule/localhost/converge.yml @@ -15,4 +15,3 @@ - name: "Include tasks" ansible.builtin.include_role: name: "{{ role_name }}" - diff --git a/molecule/localhost/molecule.yml b/molecule/localhost/molecule.yml index 9454705..ea458f1 100644 --- a/molecule/localhost/molecule.yml +++ b/molecule/localhost/molecule.yml @@ -27,4 +27,3 @@ lint: | verifier: name: ansible - diff --git a/molecule/wsl/converge.yml b/molecule/wsl/converge.yml index 0f5f3e6..92be822 100644 --- a/molecule/wsl/converge.yml +++ b/molecule/wsl/converge.yml @@ -24,4 +24,3 @@ - name: "Include tasks" ansible.builtin.include_role: name: "{{ role_name }}" - diff --git a/molecule/wsl/molecule.yml b/molecule/wsl/molecule.yml index 9360997..d4245c2 100644 --- a/molecule/wsl/molecule.yml +++ b/molecule/wsl/molecule.yml @@ -26,4 +26,3 @@ lint: | verifier: name: ansible - diff --git a/templates/ansible_vars_goss.yml.j2 b/templates/ansible_vars_goss.yml.j2 index 8749fc1..04a8284 100644 --- a/templates/ansible_vars_goss.yml.j2 +++ b/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 }} diff --git a/templates/etc/dconf/db/00-screensaver.j2 b/templates/etc/dconf/db/00-screensaver.j2 index 0b9f686..822b33d 100644 --- a/templates/etc/dconf/db/00-screensaver.j2 +++ b/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] diff --git a/templates/etc/sysctl.d/60-kernel_sysctl.conf.j2 b/templates/etc/sysctl.d/60-kernel_sysctl.conf.j2 index 8bd0157..11b3e2a 100644 --- a/templates/etc/sysctl.d/60-kernel_sysctl.conf.j2 +++ b/templates/etc/sysctl.d/60-kernel_sysctl.conf.j2 @@ -1,8 +1,7 @@ ## This file is managed by Ansible, YOUR CHANGES WILL BE LOST! - {% if rhel9cis_rule_1_5_3 %} # Kernel sysctl # CIS 1.5.3 kernel.randomize_va_space = 2 -{% endif %} \ No newline at end of file +{% endif %}