From 30ea74719288dccb01aefcbe5d8e8f350f54b3af Mon Sep 17 00:00:00 2001 From: canihavethisone Date: Sat, 6 Apr 2024 10:34:54 +1100 Subject: [PATCH 1/2] Correct commented secpol title --- CHANGELOG.md | 9 +++++++++ data/windows/secpol.yaml | 2 +- metadata.json | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29d64ba..654f439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. + +## Release 0.2.2 + +**Features** + +**Bugfixes** +- Correct commented secpol title + + ## Release 0.2.1 **Features** diff --git a/data/windows/secpol.yaml b/data/windows/secpol.yaml index b248169..31cbb53 100644 --- a/data/windows/secpol.yaml +++ b/data/windows/secpol.yaml @@ -309,7 +309,7 @@ cis_security_hardening_windows::cis_secpol_level_1: # 'Interactive logon: Require Domain Controller authentication to unlock workstation': # policy_value: '1' -# (L1) Ensure 'Network access: Allow anonymous SID/Name translation' is set to 'Disabled' + "(L1) Ensure 'Network access: Allow anonymous SID/Name translation' is set to 'Disabled'": 'Network access: Allow anonymous SID/name translation': policy_value: '0' diff --git a/metadata.json b/metadata.json index b2df0aa..99a8c80 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "canihavethisone-cis_security_hardening_windows", - "version": "0.2.1", + "version": "0.2.2", "author": "canihavethisone", "summary": "Harden Windows 10 & 11 to CIS standards", "license": "Apache-2.0", From 6697e078d356994a84f372240bb7305c88d0a3d5 Mon Sep 17 00:00:00 2001 From: canihavethisone Date: Sat, 20 Apr 2024 13:56:51 +1000 Subject: [PATCH 2/2] Removed commented code --- Gemfile | 1 + metadata.json | 2 +- spec/spec_helper_acceptance.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 4622bd1..1dd7b19 100644 --- a/Gemfile +++ b/Gemfile @@ -19,6 +19,7 @@ gem "mocha" gem "parallel" gem "parallel_tests", '>= 4.5.1', group: [:development, :test] #gem "parallel_rspec" +gem "in-parallel" gem "pry" gem "puppet", "< 8.0.0" gem "puppet-blacksmith" diff --git a/metadata.json b/metadata.json index 99a8c80..8fb6f72 100644 --- a/metadata.json +++ b/metadata.json @@ -58,4 +58,4 @@ "pdk-version": "3.0.1", "template-url": "pdk-default#3.0.0", "template-ref": "tags/3.0.0-0-g5bfc1c0" -} +} \ No newline at end of file diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 53c4090..5b47aac 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -202,7 +202,7 @@ def setup_puppet_on(_host, opts = {}) ## Disable and force kill Windows Update service if running on(agent, powershell('Set-Service wuauserv -StartupType Disabled')) on(agent, powershell("taskkill /f /t /fi 'SERVICES eq wuauserv'"), acceptable_exit_codes: [0, 1]) - on(agent, powershell('Stop-Service wuauserv -Force')) + on(agent, powershell('Stop-Service wuauserv -Force'), acceptable_exit_codes: [0, 1]) ## Check if puppet-agent is installed, otherwise install it result = on(agent, powershell('if((gp HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\*).DisplayName -Match \'Puppet Agent\') {exit 0} else {exit 1}')) if result.exit_code == 1