Skip to content

Commit

Permalink
Use FQCN with non-core modules
Browse files Browse the repository at this point in the history
Fix requirements.yml while at it.
  • Loading branch information
myllynen committed Sep 13, 2022
1 parent 9f2ea93 commit 78d0373
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 17 deletions.
5 changes: 3 additions & 2 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
collections:
- ansible.posix
- community.general
- name: https://github.com/myllynen/rhel-ansible-roles
type: git
version: master
8 changes: 4 additions & 4 deletions roles/firewall/tasks/enable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
ports_to_open: "{{ (__firewall_always_open_ports | default([], true) + firewall_open_ports | default([], true)) | select() | list | unique }}"

- name: Open configured ports in firewall
firewalld:
ansible.posix.firewalld:
zone: "{{ firewall_default_zone }}"
port: "{{ item }}"
permanent: true
Expand All @@ -54,7 +54,7 @@
changed_when: false

- name: Close unconfigured ports in firewall
firewalld:
ansible.posix.firewalld:
zone: "{{ firewall_default_zone }}"
port: "{{ item }}"
permanent: true
Expand All @@ -79,7 +79,7 @@
services_to_open: "{{ (__firewall_always_open_services | default([], true) + firewall_open_services | default([], true)) | select() | list | unique }}"

- name: Open configured services in firewall
firewalld:
ansible.posix.firewalld:
zone: "{{ firewall_default_zone }}"
service: "{{ item }}"
permanent: true
Expand All @@ -93,7 +93,7 @@
changed_when: false

- name: Close unconfigured services in firewall
firewalld:
ansible.posix.firewalld:
zone: "{{ firewall_default_zone }}"
service: "{{ item }}"
permanent: true
Expand Down
2 changes: 1 addition & 1 deletion roles/repository_setup/tasks/disable.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- name: Unsubscribe from Red Hat Subscription Management
redhat_subscription:
community.general.redhat_subscription:
state: absent

- name: Remove Katello CA package
Expand Down
6 changes: 3 additions & 3 deletions roles/repository_setup/tasks/enable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- repository_setup_install_katello_rpm | bool

- name: Configure Red Hat Subscription
redhat_subscription:
community.general.redhat_subscription:
activationkey: "{{ repository_setup_rhsm_parameters.activationkey | default(omit) }}"
orgid: "{{ repository_setup_rhsm_parameters.orgid | default(omit) }}"
username: "{{ repository_setup_rhsm_parameters.username | default(omit) }}"
Expand Down Expand Up @@ -39,13 +39,13 @@
('username' in repository_setup_rhsm_parameters)

- name: Disable Red Hat repositories
rhsm_repository:
community.general.rhsm_repository:
name: "{{ repository_setup_rhsm_repositories_disable }}"
state: disabled
when: repository_setup_rhsm_repositories_disable | default(false)

- name: Enable Red Hat repositories
rhsm_repository:
community.general.rhsm_repository:
name: "{{ repository_setup_rhsm_repositories_enable }}"
purge: "{{ repository_setup_rhsm_repositories_purge }}"
state: enabled
Expand Down
2 changes: 1 addition & 1 deletion roles/security_hardening/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
state: present

- name: Configure SELinux state
selinux:
ansible.posix.selinux:
policy: targeted
state: "{{ selinux }}"
register: selinux_config
Expand Down
2 changes: 1 addition & 1 deletion roles/splunk_forwarder/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,6 @@
when: package_install is changed

- name: Log message on package install
syslogger:
community.general.syslogger:
msg: "{{ splunk_version.stdout }} installed on {{ ansible_facts.fqdn }}."
when: package_install is changed
4 changes: 2 additions & 2 deletions roles/system_coredump/tasks/disable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
when: core_config is changed

- name: Disallow suid binary coredumps
sysctl:
ansible.posix.sysctl:
name: fs.suid_dumpable
value: '0'
sysctl_file: /etc/sysctl.d/50-coredump.conf
sysctl_set: true
register: suid_config

- name: Restore system default core pattern configuration
sysctl:
ansible.posix.sysctl:
name: kernel.core_pattern
value: 'core'
sysctl_file: /etc/sysctl.d/50-coredump.conf
Expand Down
4 changes: 2 additions & 2 deletions roles/system_coredump/tasks/enable.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
- name: Configure system core dump pattern
sysctl:
ansible.posix.sysctl:
name: kernel.core_pattern
value: '/var/lib/systemd/coredump/core'
sysctl_file: /etc/sysctl.d/50-coredump.conf
sysctl_set: true
register: pattern_config

- name: Allow safe suid binary coredumps
sysctl:
ansible.posix.sysctl:
name: fs.suid_dumpable
value: '2'
sysctl_file: /etc/sysctl.d/50-coredump.conf
Expand Down
2 changes: 1 addition & 1 deletion roles/timezone/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
- name: Configure system timezone
timezone:
community.general.timezone:
name: "{{ timezone }}"

0 comments on commit 78d0373

Please sign in to comment.