journalwatch: allow more TLS errors

[ansible.git] / host_vars / template.yml

diff --git a/host_vars/template.yml b/host_vars/template.yml
index 199180ebc22fff708af8ecd4c03538e07dc89bb2..941796b40256156fc178ce1be80ab22e979661e3 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
@@ -47,10 +51,12 @@ postfix:
   # 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_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 +67,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
@@ -81,5 +92,6 @@ bind:
 etherpad:
   domain: pad.example.org
   default_text: "Welcome to Etherpad!\\n\\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\\n\\nGet involved with Etherpad at http:\/\/etherpad.org\\n"
+  # Also see <https://github.com/ether/etherpad-lite/issues/3959> for some database configuration advice!
   mysql_password: $RANDOM
   admin_password: $RANDOM