Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2023 September Updates based on CIS Benchmark v2.0.0 + Typo Fixes + Enhancements #20

Merged
merged 61 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
1c6f863
Update workflows and readme -1
frederickw082922 Aug 28, 2023
82ddb0b
Update workflow-1
frederickw082922 Aug 28, 2023
3f49018
Audit removal and ChangeLog update -1
frederickw082922 Aug 30, 2023
7ad1647
Audit tasks update-1
frederickw082922 Aug 30, 2023
ac65fda
Audit tasks update-2
frederickw082922 Aug 30, 2023
1a1a278
Update Dafults+main update-1
frederickw082922 Aug 31, 2023
8f8f180
Update Dafults+main update-2
frederickw082922 Aug 31, 2023
c4444b8
Update Dafults+main update-3
frederickw082922 Aug 31, 2023
6e3a262
Update Dafults+main update-3
frederickw082922 Aug 31, 2023
68f0572
Update Dafults+main update-4
frederickw082922 Aug 31, 2023
52b2321
Update Dafults+main update-5
frederickw082922 Aug 31, 2023
13521a2
Update Dafults+main update-6
frederickw082922 Aug 31, 2023
3548653
Update Dafults+main update-7
frederickw082922 Aug 31, 2023
339f715
Update Dafults+main update-8
frederickw082922 Aug 31, 2023
d84f7a5
Update Dafults+main update-9
frederickw082922 Aug 31, 2023
58fe688
Update Dafults+main update-10
frederickw082922 Aug 31, 2023
f60e5d6
Update Defaults+main update-11
frederickw082922 Sep 1, 2023
43e587b
Update Defaults+main update-12
frederickw082922 Sep 1, 2023
7864b5a
Update Defaults+main update-13
frederickw082922 Sep 1, 2023
77f612e
Update Defaults+main update-14
frederickw082922 Sep 1, 2023
ded319c
Update Defaults+main update-15
frederickw082922 Sep 1, 2023
b4ab8ab
Update Defaults+main update-16
frederickw082922 Sep 5, 2023
bd1aa9f
Update Defaults+main update-17
frederickw082922 Sep 5, 2023
8f74ed0
Update Defaults+main update-18
frederickw082922 Sep 5, 2023
467f0bc
Update Defaults+main update-19
frederickw082922 Sep 5, 2023
6bed9ca
Update Defaults+main update-20
frederickw082922 Sep 5, 2023
191134a
Update Defaults+main update-21
frederickw082922 Sep 7, 2023
72d4f96
Update Defaults+main update-22
frederickw082922 Sep 8, 2023
1cab77a
Update sec2 removed 2.3.1.6
frederickw082922 Sep 11, 2023
86870e2
Update discord url and Order to 18.6.4.1
frederickw082922 Sep 14, 2023
0d5cbf6
Update to 18.6.8.1
frederickw082922 Sep 15, 2023
6339ff1
Update to 18.9.38.1
frederickw082922 Sep 15, 2023
c32d4a7
Update to 19.7.7.2
frederickw082922 Sep 18, 2023
883bc53
Update to 19.x
frederickw082922 Sep 19, 2023
6a70b26
Update to 19.x-2
frederickw082922 Sep 19, 2023
a1e4c42
Update to 19.x-3
frederickw082922 Sep 19, 2023
fe19823
Update to 19.x-4
frederickw082922 Sep 19, 2023
edaf166
Update import_task with file:
frederickw082922 Sep 20, 2023
5c87df1
Update Printer Spooler 5.0 to Service Module
frederickw082922 Sep 20, 2023
444f29f
Update Printer Spooler 5.0 to Service Module-2
frederickw082922 Sep 20, 2023
13c05b8
Update defaults/main vars -1
frederickw082922 Sep 21, 2023
992926a
Update ChangeLog, Readme and main/handelers
frederickw082922 Sep 21, 2023
0115e41
Update ChangeLog and Section5x with registry-1
frederickw082922 Sep 21, 2023
5c4d3d1
Update Section5x with service-2
frederickw082922 Sep 21, 2023
42e6bef
Update Section5x with service-3
frederickw082922 Sep 21, 2023
e6f6664
Typo Fixes
frederickw082922 Sep 21, 2023
cf075e3
Typo Fixes-2
frederickw082922 Sep 21, 2023
5d50eb0
Updated DC & MS Only titles and when statements -1
frederickw082922 Sep 25, 2023
00ccb3b
Updated DC & MS Only titles and when statements -2
frederickw082922 Sep 25, 2023
84f3177
Updated DC & MS Only titles and when statements -3
frederickw082922 Sep 25, 2023
df624c9
Updated DC & MS Only titles and when statements -4
frederickw082922 Sep 25, 2023
4995bf7
Updated 18x and default/main Controls with multi input based from CI…
frederickw082922 Sep 25, 2023
5735bc0
Updated 18x and default/main Controls with multi input based from CI…
frederickw082922 Sep 25, 2023
af9e7df
Updated 18x and default/main Controls with multi input based from CI…
frederickw082922 Sep 26, 2023
5547b3b
Added DC and MS to Cloud Order for lock out controls
frederickw082922 Sep 27, 2023
b505c7e
Typo Fixes
frederickw082922 Sep 27, 2023
3a3053d
Typo Fixes defaults/main
frederickw082922 Sep 27, 2023
0019911
Update DC/MS Lockout order Fix
frederickw082922 Sep 27, 2023
f37c9a3
Update sec18.7.x controls
frederickw082922 Sep 28, 2023
c7591ab
Update sec18.7.x controls-1
frederickw082922 Sep 28, 2023
3cab909
Updated section 18.7.x -1
frederickw082922 Oct 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
---

parseable: true
quiet: true
skip_list:
- 'schema'
- 'no-changed-when'
- 'var-spacing'
- 'fqcn-builtins'
- 'experimental'
- 'name[play]'
- 'name[casing]'
- 'name[template]'
- 'fqcn[action]'
- 'jinja[spacing]'
- 'yaml[line-length]'
- 'key-order[task]'
- 'var-naming' # Older playbook no new release
- '204'
- '208'
- '305'
- '303'
- '403'
- '306'
- '602'
- '208'
use_default_rules: true
verbosity: 0
40 changes: 0 additions & 40 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE/feature-request-or-enhancement.md

This file was deleted.

19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/question.md

This file was deleted.

15 changes: 0 additions & 15 deletions .github/pull_request_template.md

This file was deleted.

143 changes: 143 additions & 0 deletions .github/workflows/devel_pipeline_validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
---

# This is a basic workflow to help you get started with Actions

name: Devel Pipeline Validation

# Controls when the action will run.
# Triggers the workflow on push or pull request
# events but only for the devel branch
on: # yamllint disable-line rule:truthy
pull_request_target:
types: [opened, reopened, synchronize]
branches:
- devel
paths:
- '**.yml'
- '**.sh'
- '**.j2'
- '**.ps1'
- '**.cfg'

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
# This section contains all the jobs below that are running in the workflow.
jobs:
# This will create messages for the first time contributors and direct them to the Discord server
welcome:
# The type of runner that the job will run on.
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@main
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
pr-message: |-
Congrats on opening your first pull request and thank you for taking the time to help improve Ansible-Lockdown!
Please join in the conversation happening on the [Discord Server](https://www.lockdownenterprise.com/discord) as well.

# This workflow will run Terraform to load an instance in Azure to test the playbook against a live cloud-based instance.
playbook-test:
# The type of runner that the job will run on.
runs-on: ubuntu-latest

env:
ENABLE_DEBUG: false
# Imported as a variable by terraform.
TF_VAR_repository: ${{ github.event.repository.name }}
ARM_CLIENT_ID: ${{ secrets.AZURE_AD_CLIENT_ID }}
ARM_CLIENT_SECRET: ${{ secrets.AZURE_AD_CLIENT_SECRET }}
ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
ARM_TENANT_ID: ${{ secrets.AZURE_AD_TENANT_ID }}
WIN_USERNAME: ${{ secrets.WIN_USERNAME }}
WIN_PASSWORD: ${{ secrets.WIN_PASSWORD }}

defaults:
run:
shell: bash
working-directory: .github/workflows/github_windows_IaC

# Steps represent a sequence of tasks that will be executed as part of the job.
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it.
- name: Clone ${{ github.event.repository.name }}
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

# Pull In Terraform Code For Windows Azure
- name: Clone github IaC plan
uses: actions/checkout@v3
with:
repository: ansible-lockdown/github_windows_IaC
path: .github/workflows/github_windows_IaC

# Sensitive Data Stored And Passed To Terraform
# Default Working Dir Defined In Defaults Above.
- name: user details
run: echo "{\"username\":\"${WIN_USERNAME}\",\"password\":\"${WIN_PASSWORD}\"}" >> sensitive_info.json

# Show the Os Var and Benchmark Type And Load
- name: DEBUG - Show IaC files
if: env.ENABLE_DEBUG == 'true'
run: |
echo "OSVAR = $OSVAR"
echo "benchmark_type = $benchmark_type"
pwd
ls
env:
# Imported from github variables this is used to load the relevant OS.tfvars file
OSVAR: ${{ vars.OSVAR }}
TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}

# Initialize The Terraform Working Directory
- name: Terraform_Init
id: init
run: terraform init
env:
# Imported from github variables this is used to load the relevant OS.tfvars file
OSVAR: ${{ vars.OSVAR }}
TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}

# Validate The Syntax Of Terraform Files
- name: Terraform_Validate
id: validate
run: terraform validate
env:
# Imported from github variables this is used to load the relevant OS.tfvars file
OSVAR: ${{ vars.OSVAR }}
TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}

# Execute The Actions And Build Azure Server
- name: Terraform_Apply
id: apply
env:
# Imported from github variables this is used to load the relevant OS.tfvars file
WIN_USERNAME: ${{ secrets.WIN_USERNAME }}
WIN_PASSWORD: ${{ secrets.WIN_PASSWORD }}
OSVAR: ${{ vars.OSVAR }}
TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
run: terraform apply -var-file "${OSVAR}.tfvars" --auto-approve

# Debug Section
- name: DEBUG - Show Ansible Hostfile
if: env.ENABLE_DEBUG == 'true'
run: cat hosts.yml

# Run the Ansible Playbook
- name: Run_Ansible_Playbook
uses: arillso/action.playbook@master
with:
playbook: site.yml
inventory: .github/workflows/github_windows_IaC/hosts.yml
galaxy_file: collections/requirements.yml
# verbose: 3
env:
ANSIBLE_HOST_KEY_CHECKING: "false"
ANSIBLE_DEPRECATION_WARNINGS: "false"

# Destroy The Azure Test System
- name: Terraform_Destroy
if: always() && env.ENABLE_DEBUG == 'false'
env:
OSVAR: ${{ vars.OSVAR }}
TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
run: terraform destroy -var-file "${OSVAR}.tfvars" --auto-approve
Loading
Loading