don't re-patch (manually) patched mailman

[ansible.git] / host_vars / template.yml

diff --git a/host_vars/template.yml b/host_vars/template.yml
index fb971bae652e0a7f4529bbb674b74e7636e3beac..857dbe4c90a59322ddf1168ec6a4de35471c997f 100644 (file)
--- a/host_vars/template.yml
+++ b/host_vars/template.yml
@@ -1,6 +1,8 @@
 postfix:
   # postmaster email address
   postmaster: postmaster@example.org
 postfix:
   # postmaster email address
   postmaster: postmaster@example.org

+  # optional: Hostname of this email system
+  hostname: mail.example.org

   # optional: Whether to put a postscreen on port 25
   postscreen: True
   # optional: Open another SMTP daemon on port 26 that only accepts mail from local hosts
   # optional: Whether to put a postscreen on port 25
   postscreen: True
   # optional: Open another SMTP daemon on port 26 that only accepts mail from local hosts


@@ -12,6 +14,8 @@ postfix:
   submission: True
   # optional: From which IPs to accept mail.
   mynetworks: '127.0.0.0/8 [::1]/128 203.0.113.0/24'
   submission: True
   # optional: From which IPs to accept mail.
   mynetworks: '127.0.0.0/8 [::1]/128 203.0.113.0/24'

+  # optional: Domains for which to receive emails and forward according to virtual_alias_map.
+  alias_domains: staff.example.org

   # optional: Hostnames and SHA1 certificate hashes that are allowed to relay email via this host.
   relay_client_cert_whitelist:
     - hostname: other.example.org
   # optional: Hostnames and SHA1 certificate hashes that are allowed to relay email via this host.
   relay_client_cert_whitelist:
     - hostname: other.example.org


@@ -47,6 +51,7 @@ postfix:
   # optional: install and configure mailman
   mailman:
     default_host: lists.example.org
   # optional: install and configure mailman
   mailman:
     default_host: lists.example.org

+    smtp_outgoing: smtp2

     default_lang: en # if you change this, also run "dpkg-reconfigure mailman" to enable more languages
     domains: # the file /etc/postfix/virtual_alias_map can be used to configure aliases
     - lists.example.org
     default_lang: en # if you change this, also run "dpkg-reconfigure mailman" to enable more languages
     domains: # the file /etc/postfix/virtual_alias_map can be used to configure aliases
     - lists.example.org