4
0
Fork 0

updates var naming

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
This commit is contained in:
Mark Bolwell 2022-04-06 16:31:57 +01:00
parent c451f15546
commit 7374c37510
No known key found for this signature in database
GPG key ID: F734FDFC154B83FB
2 changed files with 24 additions and 24 deletions

View file

@ -453,15 +453,15 @@ rhel9cis_is_mail_server: false
# Note the options # Note the options
# Packages are used for client services and Server- only remove if you dont use the client service # Packages are used for client services and Server- only remove if you dont use the client service
# #
rhel9cis_use_nfs:
- service: false rhel9cis_use_nfs_server: false
- server: false rhel9cis_use_nfs_service: false
rhel9_use_rpc:
- service: false rhel9cis_use_rpc_server: false
- server: false rhel9cis_use_rpc_service: false
rhel9cis_use_rsync:
- service: false rhel9cis_use_rsync_server: false
- server: false rhel9cis_use_rsync_service: false
#### 2.3 Service clients #### 2.3 Service clients
rhel9cis_ypbind_required: false rhel9cis_ypbind_required: false
@ -592,9 +592,9 @@ rhel9cis_rsyslog_ansiblemanaged: true
# 5.5.1 # 5.5.1
## PAM ## PAM
rhel9cis_pam_password: | rhel9cis_pam_password:
minlen = 14 minlen: 14
minclass = 4 minclass: 4
rhel9cis_pam_faillock: rhel9cis_pam_faillock:
remember: 5 remember: 5

View file

@ -310,8 +310,8 @@
name: nfs-utils name: nfs-utils
state: absent state: absent
when: when:
- not rhel9cis_use_nfs.server - not rhel9cis_use_nfs_server
- not rhel9cis_use_nfs.service - not rhel9cis_use_nfs_service
- name: "2.2.18 | PATCH | Ensure nfs-utils is not installed or the nfs-server service is masked | mask service" - name: "2.2.18 | PATCH | Ensure nfs-utils is not installed or the nfs-server service is masked | mask service"
systemd: systemd:
@ -319,8 +319,8 @@
masked: true masked: true
state: stopped state: stopped
when: when:
- not rhel9cis_use_nfs.server - not rhel9cis_use_nfs_server
- rhel9cis_use_nfs.service - rhel9cis_use_nfs_service
when: when:
- "'nfs-utils' in ansible_facts.packages" - "'nfs-utils' in ansible_facts.packages"
- rhel9cis_rule_2_2_18 - rhel9cis_rule_2_2_18
@ -342,8 +342,8 @@
name: rpcbind name: rpcbind
state: absent state: absent
when: when:
- not rhel9cis_use_rpc.server - not rhel9cis_use_rpc_server
- not rhel9cis_use_rpc.service - not rhel9cis_use_rpc_service
- name: "2.2.19 | PATCH | Ensure rpcbind is not installed or the rpcbind services are masked | mask service" - name: "2.2.19 | PATCH | Ensure rpcbind is not installed or the rpcbind services are masked | mask service"
systemd: systemd:
@ -351,8 +351,8 @@
masked: true masked: true
state: stopped state: stopped
when: when:
- rhel9cis_use_rpc.server - rhel9cis_use_rpc_server
- not rhel9cis_use_rpc.service - not rhel9cis_use_rpc_service
when: when:
- "'rpcbind' in ansible_facts.packages" - "'rpcbind' in ansible_facts.packages"
- rhel9cis_rule_2_2_19 - rhel9cis_rule_2_2_19
@ -373,8 +373,8 @@
name: rsync name: rsync
state: absent state: absent
when: when:
- not rhel9cis_use_rsync.server - not rhel9cis_use_rsync_server
- not rhel9cis_use_rsync.service - not rhel9cis_use_rsync_service
- name: "2.2.20 | PATCH | Ensure rsync service is not enabled | mask service" - name: "2.2.20 | PATCH | Ensure rsync service is not enabled | mask service"
systemd: systemd:
@ -382,8 +382,8 @@
masked: true masked: true
state: stopped state: stopped
when: when:
- rhel9cis_use_rsync.server - rhel9cis_use_rsync_server
- not rhel9cis_use_rsync.service - not rhel9cis_use_rsync_service
when: when:
- "'rsync' in ansible_facts.packages" - "'rsync' in ansible_facts.packages"
- rhel9cis_rule_2_2_20 - rhel9cis_rule_2_2_20