From df3f691a00149cd38fb1ffc68d73588f6f7c8d81 Mon Sep 17 00:00:00 2001 From: Alexander Christoph Bihlmaier Date: Wed, 30 Oct 2019 13:11:12 +0100 Subject: [PATCH 01/10] add support for Suse --- vars/Suse.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 vars/Suse.yml diff --git a/vars/Suse.yml b/vars/Suse.yml new file mode 100644 index 0000000..e3ecdd9 --- /dev/null +++ b/vars/Suse.yml @@ -0,0 +1,10 @@ +--- +# vars file for arillso.postfix + +postfix_packages: + - postfix + - cyrus-sasl-plain + - cyrus-sasl + - mailx + +psotfix_daemon_directory: /usr/libexec/postfix From b5e0978cb2ee1ee8442421948f0f1e7c9b138579 Mon Sep 17 00:00:00 2001 From: Frank Giesecke Date: Wed, 20 Jan 2021 13:48:16 +0100 Subject: [PATCH 02/10] use comment filter to support multiline ansible management message --- templates/main.cf.j2 | 4 ++-- templates/sasl_passwd.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/main.cf.j2 b/templates/main.cf.j2 index 33e2b4c..d844f08 100644 --- a/templates/main.cf.j2 +++ b/templates/main.cf.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} disable_vrfy_command = {{ postfix_disable_vrfy_command }} # smtpd_banner = $myhostname ESMTP $mail_name @@ -64,4 +64,4 @@ smtp_tls_security_level = encrypt smtp_tls_note_starttls_offer = yes {% endif %} {% endif %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/templates/sasl_passwd.j2 b/templates/sasl_passwd.j2 index eafafd0..06c643a 100644 --- a/templates/sasl_passwd.j2 +++ b/templates/sasl_passwd.j2 @@ -1,3 +1,3 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} [{{ postfix_relayhost }}]:{{ postfix_relayhost_port }} {{ postfix_sasl_user }}:{{ postfix_sasl_password }} From 0530db040f1e6d8c8d0fc162f9b78eb297e84ce6 Mon Sep 17 00:00:00 2001 From: Alexander Christoph Bihlmaier Date: Wed, 17 Mar 2021 17:36:42 +0100 Subject: [PATCH 03/10] remove python2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e4bb391..8dc8c9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- language: python -python: "2.7" +#python: "2.7" # Use the new container infrastructure sudo: false From f549b9430873bdb7c9b5e9394db9059883272f93 Mon Sep 17 00:00:00 2001 From: Alexander Christoph Bihlmaier Date: Wed, 17 Mar 2021 17:39:58 +0100 Subject: [PATCH 04/10] added space --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8dc8c9a..4417bb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- language: python -#python: "2.7" +# python: "2.7" # Use the new container infrastructure sudo: false From 9c54a0089c02e3b6613f1f4e809cc7bbcbf2d545 Mon Sep 17 00:00:00 2001 From: Alexander Christoph Bihlmaier Date: Wed, 17 Mar 2021 17:54:21 +0100 Subject: [PATCH 05/10] modify meta information --- .gitmodules | 3 +++ meta/main.yml | 3 ++- tests | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 tests diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d621601 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "tests"] + path = tests + url = https://github.com/arillso/tests diff --git a/meta/main.yml b/meta/main.yml index 8488313..0386264 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,6 +1,7 @@ --- - galaxy_info: + role_name: postfix + description: Ansible Postfix Role by arillso author: arillso description: Ansible role for installing and Configuration Pstfix on installs RHEL/CentOS or Debian/Ubuntu. license: MIT diff --git a/tests b/tests new file mode 160000 index 0000000..a47d24a --- /dev/null +++ b/tests @@ -0,0 +1 @@ +Subproject commit a47d24ab4e1963c0a6c790b969d32772ba1226f1 From ffdcc821c3b3be449b3f9bb79b568ee26a57570d Mon Sep 17 00:00:00 2001 From: Alexander Christoph Bihlmaier Date: Wed, 17 Mar 2021 17:58:43 +0100 Subject: [PATCH 06/10] this is wrong --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d621601..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "tests"] - path = tests - url = https://github.com/arillso/tests From 3184a229b62c6cda40d5fa8684a3a5ad6093d9b4 Mon Sep 17 00:00:00 2001 From: Alexander Christoph Bihlmaier Date: Wed, 17 Mar 2021 18:06:14 +0100 Subject: [PATCH 07/10] "tests" entfernt --- tests | 1 - 1 file changed, 1 deletion(-) delete mode 160000 tests diff --git a/tests b/tests deleted file mode 160000 index a47d24a..0000000 --- a/tests +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a47d24ab4e1963c0a6c790b969d32772ba1226f1 From 60dd0e6a83e630bf4906171a4d5cb821caad03da Mon Sep 17 00:00:00 2001 From: Alexander Christoph Bihlmaier Date: Wed, 17 Mar 2021 18:10:54 +0100 Subject: [PATCH 08/10] oups --- meta/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 0386264..f925aee 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,7 +1,6 @@ --- galaxy_info: role_name: postfix - description: Ansible Postfix Role by arillso author: arillso description: Ansible role for installing and Configuration Pstfix on installs RHEL/CentOS or Debian/Ubuntu. license: MIT From 6090d7640ea703fa153c82045d443f9b02adc7d6 Mon Sep 17 00:00:00 2001 From: Alexander Christoph Bihlmaier Date: Wed, 17 Mar 2021 18:16:01 +0100 Subject: [PATCH 09/10] boolean comparison --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 894da31..927f511 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -42,7 +42,7 @@ owner: root group: root mode: 0600 - when: postfix_relayhost != false + when: postfix_relayhost|bool != false notify: - postmap sasl_passwd - restart postfix From a3c93dd36595b20131b2bb2d4e94f26606795993 Mon Sep 17 00:00:00 2001 From: Alexander Christoph Bihlmaier Date: Wed, 17 Mar 2021 18:32:55 +0100 Subject: [PATCH 10/10] avoid literal comparison --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 927f511..7a1eb44 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -42,7 +42,7 @@ owner: root group: root mode: 0600 - when: postfix_relayhost|bool != false + when: postfix_relayhost notify: - postmap sasl_passwd - restart postfix