Skip to content

Commit fc11c91

Browse files
committed
Remove AIDE, bump Ubuntu CIS role version
1 parent b6cf353 commit fc11c91

File tree

3 files changed

+4
-50
lines changed

3 files changed

+4
-50
lines changed

etc/kayobe/ansible/maintenance/cis.yml

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,5 @@
11
---
2-
- name: CIS - Ensure existing AIDE installation is cleaned
3-
hosts: cis-hardening
4-
become: true
5-
tags:
6-
- cis
7-
gather_facts: true
8-
tasks:
9-
- name: Gather package facts
10-
ansible.builtin.package_facts:
11-
manager: auto
12-
13-
- name: Check if AIDE cleanup has already run
14-
ansible.builtin.stat:
15-
path: /opt/kayobe/aide/aide_cleanup_complete.flag
16-
register: aide_cleanup_flag
17-
18-
- name: Cleanup existing AIDE config
19-
when:
20-
- "'aide' in ansible_facts.packages"
21-
- not aide_cleanup_flag.stat.exists
22-
- ansible_facts.distribution == 'Ubuntu'
23-
block:
24-
- name: Ensure AIDE packages is removed
25-
ansible.builtin.apt:
26-
name:
27-
- aide
28-
- aide-common
29-
state: absent
30-
purge: true
31-
32-
- name: Ensure flag directory exists
33-
ansible.builtin.file:
34-
path: /opt/kayobe/aide
35-
state: directory
36-
mode: '0755'
37-
owner: stack
38-
group: stack
39-
40-
- name: Create flag file to prevent re-running cleanup
41-
ansible.builtin.file:
42-
path: /opt/kayobe/aide/aide_cleanup_complete.flag
43-
state: touch
44-
mode: '0644'
45-
owner: stack
46-
group: stack
47-
48-
- name: CIS - General Prerequisites
2+
- name: CIS - Prerequisites
493
hosts: cis-hardening
504
become: true
515
tags:

etc/kayobe/ansible/requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ roles:
1717
version: 1.1.0
1818
- name: ansible-lockdown.ubuntu24_cis
1919
src: https://github.com/ansible-lockdown/UBUNTU24-CIS
20-
version: 1.0.1
20+
version: 1.0.4
2121
- name: ansible-lockdown.rhel9_cis
2222
src: https://github.com/ansible-lockdown/RHEL9-CIS
2323
version: v1.3.4

etc/kayobe/inventory/group_vars/cis-hardening/cis

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ ubtu24cis_syslog_service: journald
9898
# Allow rsync server
9999
ubtu24cis_rsync_server: true
100100

101-
# AIDE is very slow to init, especially on an AIO in CI
102-
ubtu24cis_aide_init_async: 1800
101+
# AIDE doesn't play well with hosts that have been upgraded from Jammy to Noble
102+
ubtu24cis_config_aide: false
103103

104104
# Do not change Chrony Time servers
105105
ubtu24cis_rule_2_3_3_1: false

0 commit comments

Comments
 (0)