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.

Sign up for GitHub

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

Jump to bottom

Moving Devel to Main #23

Merged
merged 109 commits into from
May 4, 2023
Merged

Moving Devel to Main #23

merged 109 commits into from
May 4, 2023

Conversation

MrSteve81
Copy link
Contributor

@MrSteve81 MrSteve81 commented May 4, 2023 •
edited by uk-bolly
Loading

Overall Review of Changes:
Moving Devel to Main

Ubuntu22cis v1.0.0

  • Yamllint Check

  • Ansible-lint Check

  • Fqcn[canonical] module name

  • PR's Addressed

  • Bugs Fixed

  • Ansible 2.10.1 minimum

  • FQCNs added

  • audit alignment to use corresponding benchmark version

  • many lint improvements

  • All required changes for CIS 1.0.0 (very different from original base of ubuntu2004)

New options

  • default firewall now ufw

  • If firewall = UFW to use system sysctl settings: default

    • ubtu22cis_ufw_use_sysctl: true

  • Abilty to set alternate sysctl file for network settings: default

    • ubtu22cis_sysctl_network_conf: /etc/sysctl.conf

  • Abilty to set syslog service: choose between rsyslog or journald: default

    • ubtu22cis_syslog_service: rsyslog

  • ability to allow booting without password prompt: default

    • ubtu22cis_ask_passwd_to_boot: false
      Enhancements:
      N/A

How has this been tested?:
Locally and devel pipeline

frederickw082922 and others added 30 commits September 13, 2022 16:10
@frederickw082922
updating read me ubuntu22
0c40b7a 
Signed-off-by: Frederick Witty <frederickw@mindpointgroup.com>
@frederickw082922
Merge pull request #4 from ansible-lockdown/readme_update
3b62b12 
updating read me ubuntu22
@uk-bolly
CIS release alignment
21baa1e 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated goss version
7d32fb0 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fix lmport tasks
b299b47 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
variable fix
253fae3 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
alignment
f3ecb96 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
removed file
662bce6 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Lint updates
1964d39 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fqcn updates
f53f729 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
New layout and update
3508a3b 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
cis 1.0 updates
6bab5b7 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
cis 1.0 addition
d6bfc73 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Section3 cis 1.0.0
de71f2d 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Section3 cis 1.0.0
26566bf 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updates
a0fc4fa 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
handler naming updates
742594b 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
comment around ipv6 disable method
188ef2d 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated lint
13170bc 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Sections 3 updates
a2abd22 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Section 4 updates
855ecad 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated ordering
0e8fdec 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
cis v1.0.0 release
8353ae2 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
section6 1.0.0
63d9420 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
renamed
783e166 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
syntax and naming updates
2e37b76 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
warning facts added
c7f49b3 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Added new warning method
190c477 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
alignment
c66bc25 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Lint and naming
5fae1a7 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
uk-bolly and others added 23 commits April 3, 2023 15:11
@uk-bolly
updated to correct sysctl path
f54687f 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
corrected error
f973100 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fix loopback change
af3e240 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fix typo
0cb6c2e 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
alignment for ipv6 disable method
f140b72 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated typos
be09622 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
update var
7bd8b4c 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
improve logic
9094a6a 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
removed unnecessary var
95aa8a0 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updates var for sugroup
944a750 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
enabled prelim to capture data
e913c96 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
tidy up of control
458b2ce 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Updated meta OS NAME
5b00acf 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
5.4.3 updated
dc62b02 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
lint updates
90f7206 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated
320e179 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated to allow correct repo to be used
ff07a45 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #11 from ansible-lockdown/cis_release
f9c2892 
Cis release v1.0.0
@uk-bolly
fixed ansible version check
1bcd65d 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #12 from ansible-lockdown/ansible_version
c16e229 
fixed ansible version check
@MrSteve81
Ansible-lint, Yamllint, Module Full Names, Bugs, PRs
291b7aa 
Signed-off-by: Stephen Williams <stephenw@mindpointgroup.com>
@MrSteve81
Bootloader Password, And Log File TypeO and Size Fix
8caab29 
Signed-off-by: Stephen Williams <stephenw@mindpointgroup.com>
@MrSteve81
Merge pull request #22 from ansible-lockdown/mrsteve_april_2023_fixes
afd06b0 
Ansible-lint, Yamllint, Module Full Names, Bugs, PRs
@MrSteve81 MrSteve81 requested a review from uk-bolly May 4, 2023 14:19
uk-bolly added 3 commits May 4, 2023 16:06
@uk-bolly
updated typo
f361a57 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
added galaxy workflow
1945189 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #24 from ansible-lockdown/meta
5f58a8a 
updated typo in meta data & galaxy workflow
uk-bolly
uk-bolly approved these changes May 4, 2023
View reviewed changes
Copy link
Member

@uk-bolly uk-bolly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alot of changes first official release 👍

@uk-bolly
Copy link
Member

uk-bolly commented May 4, 2023

welcome pipeline failure will be fixed after merge

@MrSteve81 MrSteve81 merged commit 4b7a4d4 into main May 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@uk-bolly uk-bolly uk-bolly approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MrSteve81 @uk-bolly @frederickw082922