dovecot: dont override settings with their default needlessly

[ansible.git] / host_vars / template.yml

diff --git a/host_vars/template.yml b/host_vars/template.yml
index 199180ebc22fff708af8ecd4c03538e07dc89bb2..142e408e05fb8246567e8687dec221b77762a7c4 100644 (file)
--- a/host_vars/template.yml
+++ b/host_vars/template.yml
@@ -1,6 +1,8 @@
 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
@@ -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'
+  # 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
@@ -51,6 +55,7 @@ postfix:
     domains: # the file /etc/postfix/virtual_alias_map can be used to configure aliases
     - lists.example.org
     default_footer: "-- \n%(list_name)s@%(host_name)s - %(description)s\nConfiguration: %(web_page_url)slistinfo%(cgiext)s/%(list_name)s\nUnsubscribe: %(list_name)s-unsubscribe@%(host_name)s\n"
+    form_secret: $RANDOM
   # optional: Install and configure dovecot
   dovecot:
     domains: # the file /etc/postfix/virtual_alias_map can be used to configure aliases
@@ -61,11 +66,16 @@ postfix:
     quota:
       general: 1G
       trash: +10M
+    # Hostname used for both web access (to changepw) and SMTP/IMAP servers in emails
+    # sent by newmail script.
+    host: mail.example.org
     # optional: Where to generate a CGI script that users can use to change their password
     changepw_cgi: /srv/mail.example.org/cgi/changepw
 
 apache:
   default_host: www.example.org
+  webmaster: webmaster@example.org
+  server_name: web.example.org
 
 prosody:
   host: jabber.example.org