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

devel -> main cis 2.0.1 #97

Merged
merged 148 commits into from
Sep 25, 2023
Merged
Changes from 1 commit
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
01e70f8
1.1.1.7 now level2
uk-bolly Jul 6, 2023
0072409
1.1.2.x controls updated
uk-bolly Jul 6, 2023
3a33af2
updated ansible version
uk-bolly Jul 6, 2023
6328a0f
renamed file
uk-bolly Jul 6, 2023
64e558f
1.1.3.x updated
uk-bolly Jul 7, 2023
86b596e
1.1.4.x updated
uk-bolly Jul 7, 2023
41b5ddd
1.1.5.x updated
uk-bolly Jul 7, 2023
b7d1495
1.1.6.x updated
uk-bolly Jul 7, 2023
2427936
1.1.7.x updated
uk-bolly Jul 7, 2023
6ccdd65
1.1.8.x updated
uk-bolly Jul 7, 2023
b12b09e
1.2.x updated
uk-bolly Jul 7, 2023
2de8517
1.3.x updated
uk-bolly Jul 7, 2023
dab5c04
1.4.x updated
uk-bolly Jul 7, 2023
032345f
1.5.x updated
uk-bolly Jul 7, 2023
c5e377b
1.6.x updated
uk-bolly Jul 7, 2023
ed0cb4a
1.7 updated
uk-bolly Jul 7, 2023
e04f157
1.8.x updated
uk-bolly Jul 7, 2023
fbdfa71
1.9 removed
uk-bolly Jul 7, 2023
368ba9f
2.1.x updated
uk-bolly Jul 7, 2023
a4df444
2.2.x updated
uk-bolly Jul 7, 2023
9c12095
2.3.x and 2.4 updates
uk-bolly Jul 7, 2023
6a4a482
3.1.x updated
uk-bolly Jul 7, 2023
2818b1d
3.4.x updated
uk-bolly Jul 7, 2023
ec8afec
4.1.x and 4.2.x updated
uk-bolly Jul 7, 2023
6772c87
4.3.x updated
uk-bolly Jul 7, 2023
c67bed4
4.4.x updated
uk-bolly Jul 7, 2023
e97de44
fix typos
uk-bolly Jul 7, 2023
1b7a05c
4.5.x updated
uk-bolly Jul 7, 2023
e63c12c
section 4 update
uk-bolly Jul 7, 2023
4732e9a
5.1.1.x updated
uk-bolly Jul 10, 2023
d5d214d
5.1.2 and 5.1.3 updated
uk-bolly Jul 10, 2023
ba2267c
5.2.1/2/3 updated
uk-bolly Jul 10, 2023
1e5874c
updated
uk-bolly Jul 10, 2023
ca7b3ba
removed files
uk-bolly Jul 10, 2023
0f3da84
fixed labels
uk-bolly Jul 10, 2023
ced5620
5.2.4 updated
uk-bolly Jul 10, 2023
28e4988
5.2.4 rules added
uk-bolly Jul 10, 2023
7f9d81f
6.1 updated
uk-bolly Jul 10, 2023
d3cff66
lint and tidyup
uk-bolly Jul 10, 2023
553d5ec
version updates
uk-bolly Jul 10, 2023
0e969bb
fixed rule is for root passwd
uk-bolly Jul 10, 2023
f1de825
amened order of rules
uk-bolly Jul 10, 2023
f13bdbc
updated rules
uk-bolly Jul 10, 2023
2ae6dbb
updated tags and control ids
uk-bolly Jul 10, 2023
9a989ab
fixed case
uk-bolly Jul 10, 2023
85c87f1
reorder conditional
uk-bolly Jul 10, 2023
0a0e018
update variable name
uk-bolly Jul 10, 2023
1ce0024
add conditionals
uk-bolly Jul 10, 2023
e120f3d
Added files
uk-bolly Jul 10, 2023
ea067d7
updated default vars
uk-bolly Jul 10, 2023
561f399
improved bluetooth control
uk-bolly Jul 10, 2023
d5d77a3
updated vars
uk-bolly Jul 10, 2023
8c9927c
updated sudo vars
uk-bolly Jul 10, 2023
ae783ab
updated sudoers file discovery
uk-bolly Jul 10, 2023
630cb4d
fixed 1.5.3 with create
uk-bolly Jul 10, 2023
4faaa7b
updated to add chrony sources.d directory
uk-bolly Jul 10, 2023
0d97fa8
fixed notify naming
uk-bolly Jul 10, 2023
98b36b9
updated vars
uk-bolly Jul 10, 2023
25e307c
changed to system from service
uk-bolly Jul 10, 2023
4b7bb9a
fixed naming
uk-bolly Jul 10, 2023
e7a8bb9
update notify
uk-bolly Jul 10, 2023
a41a3d7
update var
uk-bolly Jul 10, 2023
26ae789
fixed multiple rule names
uk-bolly Jul 10, 2023
da9eb2f
changed syslog service handler naming
uk-bolly Jul 10, 2023
e5aee70
fixed conditional
uk-bolly Jul 10, 2023
9651d6f
fixed path and name 5.2.3.3
uk-bolly Jul 10, 2023
29fa9f3
Added new prelim check and discovery
uk-bolly Jul 11, 2023
bdbb70b
fixed typos
uk-bolly Jul 11, 2023
4a2e862
fix typos
uk-bolly Jul 11, 2023
2bf0a92
improve logic
uk-bolly Jul 11, 2023
23334f9
Added new default vars and container default
uk-bolly Jul 11, 2023
f75656d
Add container discovery
uk-bolly Jul 11, 2023
788c836
Time source options for chrony pools or servers
uk-bolly Jul 11, 2023
c1cdc77
rework of chrony control
uk-bolly Jul 11, 2023
8244b01
fix permissions
uk-bolly Jul 11, 2023
999c8be
make idempotent
uk-bolly Jul 11, 2023
738923b
fix conditional name match
uk-bolly Jul 11, 2023
352c5b7
fix conditional name match
uk-bolly Jul 11, 2023
90c7c16
fixed handler and removed state
uk-bolly Jul 11, 2023
ff317e1
fixed logic
uk-bolly Jul 11, 2023
1ae870e
Added template
uk-bolly Jul 11, 2023
7635923
removed file not required
uk-bolly Jul 11, 2023
358a90d
initial
uk-bolly Jul 11, 2023
ca5ac5a
fix logic
uk-bolly Jul 11, 2023
7e20e05
default time sync timesyncd
uk-bolly Jul 11, 2023
efa969e
improve logic
uk-bolly Jul 11, 2023
0a0609b
idempotency improvement
uk-bolly Jul 11, 2023
98085a2
fix conditional
uk-bolly Jul 11, 2023
1371f4f
updated
uk-bolly Jul 12, 2023
8693696
updated template
uk-bolly Jul 18, 2023
1188655
fix logic
uk-bolly Jul 18, 2023
a5be1f5
Added directory if missing
uk-bolly Jul 18, 2023
8b14261
reboot in post tasks only
uk-bolly Jul 18, 2023
424a80f
var alignment
uk-bolly Jul 18, 2023
e92b5c0
fixed var name
uk-bolly Jul 19, 2023
f2f4ecf
Added step to stop service
uk-bolly Jul 19, 2023
c4f565c
removed invalid entries and tidy up
uk-bolly Jul 19, 2023
737c58d
fixed rules
uk-bolly Jul 19, 2023
0d44075
Added missing mode
uk-bolly Jul 19, 2023
734002a
add min_uid var
uk-bolly Jul 19, 2023
c03dacb
lint updates
uk-bolly Jul 19, 2023
928bcbe
syslog service var added
uk-bolly Jul 19, 2023
5902dea
ufw default firewall
uk-bolly Jul 19, 2023
b87ca2e
fixed loop
uk-bolly Jul 19, 2023
792478a
fixed control 3.4.1.7
uk-bolly Jul 19, 2023
7ef3f26
Add sudo user password check
uk-bolly Jul 26, 2023
90b80d7
Merge branch 'devel' into cis_2.0.1
uk-bolly Sep 11, 2023
71b2757
updated handler naming
uk-bolly Sep 11, 2023
3463ae0
4.1.8 group updated
uk-bolly Sep 11, 2023
b7581cd
update handler & blacklist added
uk-bolly Sep 11, 2023
a2b7b00
blacklist added
uk-bolly Sep 11, 2023
f046ed0
added pre-commit setup
uk-bolly Sep 11, 2023
0d9ee73
added pre-commit
uk-bolly Sep 11, 2023
b198a6b
updated
uk-bolly Sep 11, 2023
3580160
updated secrets
uk-bolly Sep 11, 2023
06e3cc9
updated passwd_hash_algo line
uk-bolly Sep 11, 2023
d22a744
aligned var naming
uk-bolly Sep 11, 2023
492a486
Added precommit
uk-bolly Sep 13, 2023
20ed92b
updated .github content workflow
uk-bolly Sep 13, 2023
ccba850
updated secrets scan
uk-bolly Sep 13, 2023
11db92a
yamllint updates
uk-bolly Sep 13, 2023
f0f3a28
workflow updates
uk-bolly Sep 13, 2023
be4da56
updated truth value
uk-bolly Sep 13, 2023
f0e2e67
updated commits
uk-bolly Sep 13, 2023
17c7401
Merge pull request #91 from ansible-lockdown/cis_2.0.1
uk-bolly Sep 13, 2023
d2e4b58
updated discord link
uk-bolly Sep 18, 2023
47fc6e8
Merge pull request #92 from ansible-lockdown/discord_link
uk-bolly Sep 18, 2023
dd7eb09
added to create when configured logfile does not exist
uk-bolly Sep 19, 2023
c8f5ebf
updated
uk-bolly Sep 19, 2023
073df00
lint updates
uk-bolly Sep 19, 2023
a9f7ef4
audited
uk-bolly Sep 19, 2023
82ba1c3
updated baselines
uk-bolly Sep 19, 2023
03d1b7b
updated secrets
uk-bolly Sep 19, 2023
e68ea6c
Merge pull request #94 from ansible-lockdown/issue_#90
uk-bolly Sep 19, 2023
7321713
Merge pull request #95 from ansible-lockdown/issue_#90
uk-bolly Sep 19, 2023
9370aee
updated badges
uk-bolly Sep 19, 2023
d57debb
Merge pull request #96 from ansible-lockdown/badges
uk-bolly Sep 20, 2023
c48b7c9
Fixes remount /tmp typo
dderemiah Sep 20, 2023
32cbc8f
Merge pull request #93 from dderemiah/typo_fix
uk-bolly Sep 21, 2023
8223dc8
updated for grub password settings
uk-bolly Sep 21, 2023
c9881b9
updated
uk-bolly Sep 22, 2023
d236a18
updated
uk-bolly Sep 22, 2023
7b9281e
updated template for bootloader hash
uk-bolly Sep 22, 2023
a1c073c
Merge pull request #98 from ansible-lockdown/grub_passwd
MrSteve81 Sep 22, 2023
a652e11
typo fix
uk-bolly Sep 25, 2023
ebafd8d
updated goss link
uk-bolly Sep 25, 2023
5afca4c
added attributes file
uk-bolly Sep 25, 2023
9b87264
Merge pull request #99 from ansible-lockdown/readme
uk-bolly Sep 25, 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
Prev Previous commit
Next Next commit
removed invalid entries and tidy up
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
  • Loading branch information
uk-bolly committed Jul 19, 2023
commit c4f565cf78c2c84751c2ca23f4224e0e6af13ce0
9 changes: 1 addition & 8 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
---
# If you would like a report at the end accordin to OpenSCAP as to the report results
# then you should set ubtu20cis_oscap_scan to true/yes.
# NOTE: This requires the python_xmltojson package on the control host.
ubtu20cis_oscap_scan: false
ubtu20cis_report_dir: /tmp

ubtu20cis_section1_patch: true
ubtu20cis_section2_patch: true
@@ -498,7 +493,7 @@ ubtu20cis_root_pw: $6$

# 1.7.1
# disable dynamic motd to stop extra sshd message from appearing
ubtu20cis_disable_dynamic_motd: false
ubtu20cis_disable_dynamic_motd: true

# Control 1.8.2
# This will be the motd banner must not contain the below items in order to be compliant with Ubuntu 20 CIS
@@ -662,8 +657,6 @@ ubtu20cis_shell_session_timeout:
file: /etc/profile.d/tmout.sh
timeout: 900

# ubtu20cis_su_group is the su group to use with pam_wheel
ubtu20cis_su_group: "wheel"

# Section 5 Control Variables - Logging and Auditing