4
0
Fork 0

update var naming

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
This commit is contained in:
Mark Bolwell 2024-08-07 10:30:45 +01:00
parent 4f566974c9
commit 9196e916fc
No known key found for this signature in database
GPG key ID: 997FF7FE93AEB5B9
4 changed files with 45 additions and 28 deletions

View file

@ -2,8 +2,8 @@
- name: "6.2.2.1.1 | PATCH | Ensure systemd-journal-remote is installed"
when:
- ubtu22cis_rule_6_2_2_1_1
- not ubtu22cis_system_is_log_server
- rhel9cis_rule_6_2_2_1_1
- not rhel9cis_system_is_log_server
tags:
- level1-server
- level1-workstation
@ -19,8 +19,8 @@
- name: "6.2.2.1.2 | PATCH | Ensure systemd-journal-remote authentication is configured"
when:
- ubtu22cis_rule_6_2_2_1_2
- not ubtu22cis_system_is_log_server
- rhel9cis_rule_6_2_2_1_2
- not rhel9cis_system_is_log_server
tags:
- level1-server
- level1-workstation
@ -35,15 +35,15 @@
regexp: "{{ item.regexp }}"
line: "{{ item.line }}"
loop:
- { regexp: 'URL=', line: 'URL={{ ubtu22cis_remote_log_server }}'}
- { regexp: 'ServerKeyFile=', line: 'ServerKeyFile={{ ubtu22cis_journal_upload_serverkeyfile }}'}
- { regexp: 'ServerCertificateFile=', line: 'ServerCertificateFile={{ ubtu22cis_journal_servercertificatefile }}'}
- { regexp: 'TrustedCertificateFile=', line: 'TrustedCertificateFile={{ ubtu22cis_journal_trustedcertificatefile }}'}
- { regexp: 'URL=', line: 'URL={{ rhel9cis_remote_log_server }}'}
- { regexp: 'ServerKeyFile=', line: 'ServerKeyFile={{ rhel9cis_journal_upload_serverkeyfile }}'}
- { regexp: 'ServerCertificateFile=', line: 'ServerCertificateFile={{ rhel9cis_journal_servercertificatefile }}'}
- { regexp: 'TrustedCertificateFile=', line: 'TrustedCertificateFile={{ rhel9cis_journal_trustedcertificatefile }}'}
- name: "6.2.2.1.3 | PATCH | Ensure systemd-journal-remote is enabled and active"
when:
- not ubtu22cis_system_is_log_server
- ubtu22cis_rule_6_2_2_1_3
- not rhel9cis_system_is_log_server
- rhel9cis_rule_6_2_2_1_3
tags:
- level1-server
- level1-workstation
@ -59,8 +59,8 @@
- name: "6.2.2.1.4 | PATCH | Ensure systemd-journal-remote service is not in use"
when:
- not ubtu22cis_system_is_log_server
- ubtu22cis_rule_6_2_2_1_4
- not rhel9cis_system_is_log_server
- rhel9cis_rule_6_2_2_1_4
tags:
- level1-server
- level1-workstation
@ -81,7 +81,7 @@
- name: "6.2.2.2 | PATCH | Ensure journald ForwardToSyslog is disabled"
when:
- ubtu22cis_rule_6_2_2_2
- rhel9cis_rule_6_2_2_2
tags:
- level1-server
- level2-workstation
@ -110,7 +110,7 @@
- name: "6.2.2.3 | PATCH | Ensure journald Compress is configured"
when:
- ubtu22cis_rule_6_2_2_3
- rhel9cis_rule_6_2_2_3
tags:
- level1-server
- level1-workstation
@ -136,7 +136,7 @@
- name: "6.2.2.4 | PATCH | Ensure journald Storage is configured"
when:
- ubtu22cis_rule_6_2_2_4
- rhel9cis_rule_6_2_2_4
tags:
- level1-server
- level1-workstation