diff --git a/.travis.yml b/.travis.yml index e4bb391..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 diff --git a/meta/main.yml b/meta/main.yml index 8488313..f925aee 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,6 +1,6 @@ --- - galaxy_info: + role_name: postfix author: arillso description: Ansible role for installing and Configuration Pstfix on installs RHEL/CentOS or Debian/Ubuntu. license: MIT diff --git a/tasks/main.yml b/tasks/main.yml index 894da31..7a1eb44 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 notify: - postmap sasl_passwd - restart postfix 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 }} 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