From 3a43ecf27c4588d6998fdd7b71ccda3ded850668 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 4 Sep 2022 15:51:45 +0200 Subject: [PATCH] fix: refactor dynmaic vars file loading --- tasks/main.yml | 6 ++++-- vars/{default.yml => redhat-7.yml} | 0 vars/redhat.yml | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) rename vars/{default.yml => redhat-7.yml} (100%) create mode 100644 vars/redhat.yml diff --git a/tasks/main.yml b/tasks/main.yml index aa093f8..47ef06b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,13 +1,15 @@ --- -- include_vars: "{{ lookup('first_found', params) }}" +- include_vars: "{{ var_files }}" vars: + var_files: "{{ lookup('first_found', params, errors='ignore') }}" params: files: - "{{ ansible_lsb.id | default('') | lower }}.yml" + - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version }}.yml" - "{{ ansible_os_family | lower }}.yml" - - default.yml paths: - "vars" + when: var_files - include_tasks: install.yml diff --git a/vars/default.yml b/vars/redhat-7.yml similarity index 100% rename from vars/default.yml rename to vars/redhat-7.yml diff --git a/vars/redhat.yml b/vars/redhat.yml new file mode 100644 index 0000000..9812601 --- /dev/null +++ b/vars/redhat.yml @@ -0,0 +1,8 @@ +--- +__postfix_relay_packages: + - postfix + - cyrus-sasl-plain + - mailx + +__postfix_relay_daemon_directory: /usr/libexec/postfix +__postfix_relay_smtp_tls_cafile: /etc/ssl/certs/ca-bundle.crt