From ed8dbc873aaa7197dd87ce4abf315ca4b68efffc Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 6 Jul 2015 17:46:26 +0200 Subject: [PATCH] library/roles/postfix-relay: Permit to specify the receivers maximum number library/roles/ubuntu-deb-general: Remove exim. --- postfix-relay/defaults/main.yml | 1 + postfix-relay/templates/main.cf.j2 | 4 +--- ubuntu-deb-general/defaults/main.yml | 7 +++++++ ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml | 6 ++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/postfix-relay/defaults/main.yml b/postfix-relay/defaults/main.yml index 6e63d37e..15e1a0b3 100644 --- a/postfix-relay/defaults/main.yml +++ b/postfix-relay/defaults/main.yml @@ -8,6 +8,7 @@ postfix_smtp_create_relay_user: True # See vars/isti-global.yml postfix_relay_host: smtp-relay.research-infrastructures.eu postfix_relay_port: 587 +postfix_default_destination_concurrency_limit: 20 #postfix_smtp_relay_user: smtp-user # This one has to be set inside a vault file #postfix_smtp_relay_pwd: set_you_password_here_in_a_vault_encrypted_file diff --git a/postfix-relay/templates/main.cf.j2 b/postfix-relay/templates/main.cf.j2 index cc4467d0..fbd36c4f 100644 --- a/postfix-relay/templates/main.cf.j2 +++ b/postfix-relay/templates/main.cf.j2 @@ -1,6 +1,3 @@ -# See /usr/share/postfix/main.cf.dist for a commented, more complete version - - # Debian specific: Specifying a file name will cause the first # line of that file to be used as the name. The Debian default # is /etc/mailname. @@ -49,6 +46,7 @@ inet_protocols = ipv4 {% endif %} mailbox_size_limit = 0 recipient_delimiter = + +default_destination_concurrency_limit = {{ postfix_default_destination_concurrency_limit }} {% if postfix_use_sasl_auth %} smtp_sasl_auth_enable= {{ postfix_smtp_sasl_auth_enable }} smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd diff --git a/ubuntu-deb-general/defaults/main.yml b/ubuntu-deb-general/defaults/main.yml index 1bf6338e..1d2f17bd 100644 --- a/ubuntu-deb-general/defaults/main.yml +++ b/ubuntu-deb-general/defaults/main.yml @@ -61,6 +61,13 @@ cleanup_rpcbind_packages: False rpcbind_packages: - rpcbind +cleanup_exim_email_server: True +exim_email_server_pkgs: + - exim4 + - exim4-base + - exim4-config + - exim4-daemon-light + disable_ipv6: True ipv6_sysctl_value: 1 ipv6_sysctl_file: /etc/sysctl.d/10-ipv6-disable.conf diff --git a/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml b/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml index ccd0bc0d..f2a3a6ea 100644 --- a/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml +++ b/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml @@ -35,3 +35,9 @@ - packages - pkg_cleanup +- name: Remove the exim packages + apt: name={{ item }} state=removed + with_items: exim_email_server_pkgs + when: cleanup_exim_email_server + tags: [ 'packages', 'pkg_cleanup', 'exim' ] +