diff --git a/meta/main.yml b/meta/main.yml index 0e56ff6..f32d631 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -2,7 +2,6 @@ galaxy_info: author: Jaroslav Škarvada description: Configure Postfix - galaxy_tags: [system, beta] company: Red Hat, Inc. license: GPL-3.0+ min_ansible_version: "2.9" @@ -16,3 +15,12 @@ galaxy_info: - "7" - "8" - "9" + galaxy_tags: + - beta + - el6 + - el7 + - el8 + - el9 + - el10 + - fedora + - system diff --git a/tasks/selinux.yml b/tasks/selinux.yml index 1543d23..06389c8 100644 --- a/tasks/selinux.yml +++ b/tasks/selinux.yml @@ -12,8 +12,20 @@ - name: Get the smtp related tcp service ports shell: |- set -euo pipefail - firewall-cmd --info-service="{{ item }}" | \ - grep -E " +ports: +" | sed -e "s/ *ports: //" + ports="$(firewall-cmd --info-service="{{ item }}" | \ + grep -E " +ports: +" | sed -e "s/ *ports: //")" || : + if [ -z "$ports" ]; then + include="$(firewall-cmd --info-service="{{ item }}" | \ + awk '/^ +includes:/ {print $2}')" || : + if [ -n "$include" ]; then + ports="$(firewall-cmd --info-service="$include" | \ + grep -E " +ports: +" | sed -e "s/ *ports: //")" + fi + fi + if [ -z "$ports" ]; then + exit 1 + fi + echo "$ports" register: __ports changed_when: false loop: "{{ __postfix_smtp_services }}" diff --git a/vars/CentOS_10.yml b/vars/CentOS_10.yml new file mode 100644 index 0000000..117bbd9 --- /dev/null +++ b/vars/CentOS_10.yml @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-3.0-only +--- +__postfix_smtp_services: + - smtp + - smtps + - smtp-submission diff --git a/vars/RedHat_10.yml b/vars/RedHat_10.yml new file mode 100644 index 0000000..117bbd9 --- /dev/null +++ b/vars/RedHat_10.yml @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-3.0-only +--- +__postfix_smtp_services: + - smtp + - smtps + - smtp-submission