fix apache HTTP2HTTPS redirect config

[ansible.git] / host_vars / template.yml

diff --git a/host_vars/template.yml b/host_vars/template.yml
index d5e5971697173435dc09a3ea2c5586dcd59f60ec..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
 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,18 @@ 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
+      cert: 00:11:22:33:44:55:66:77:88:99:AA:BB:CC:DD:EE:FF:00:11:22:33
+  # optional: Configure a host to relay all outgoing email to.
+  # Incompatible with smtp_outgoing.
+  relay_host: mx.example.org
+  # optional: Files in /etc/postfix ($FILE.crt, $FILE.key) to use as client certificates when
+  # relaying to the relay_host.
+  relay_client_cert: client_cert

   # optional: List multiple outgoing transports using different IP addresses.
   # Requires default_smtp_outgoing to be set to one of them.  The file
   # /etc/postfix/sender_transport_map on the server can be used to configure
   # optional: List multiple outgoing transports using different IP addresses.
   # Requires default_smtp_outgoing to be set to one of them.  The file
   # /etc/postfix/sender_transport_map on the server can be used to configure


@@ -34,43 +48,35 @@ postfix:
     signing_table:
       example.org: example.org
       lists.example.org: example.org
     signing_table:
       example.org: example.org
       lists.example.org: example.org

-  # optional: List of domains and transports to use.  The file /etc/postfix/virtual_alias_map
-  # can be used to configure aliases for these domains.
-  virtual_mailbox_domains:
-    - domain: lists.example.org
-      transport: mailman
-    - domain: example.org
-      transport: lmtp:unix:private/dovecot-lmtp

   # 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
     default_lang: en # if you change this, also run "dpkg-reconfigure mailman" to enable more languages

-    domains:
+    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"
     - 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:
   # optional: Install and configure dovecot
   dovecot:

+    domains: # the file /etc/postfix/virtual_alias_map can be used to configure aliases
+    - example.org

     mysql_password: $RANDOM
     vmail_uid: 200
     mail_gid: 8
     quota:
       general: 1G
       trash: +10M
     mysql_password: $RANDOM
     vmail_uid: 200
     mail_gid: 8
     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
     # optional: Where to generate a CGI script that users can use to change their password
     changepw_cgi: /srv/mail.example.org/cgi/changepw

-  # optional: Hostnames and SHA1 certificate hashes that are allowed to relay email via this host.
-  relay_client_cert_whitelist:
-    - hostname: other.example.org
-      cert: 00:11:22:33:44:55:66:77:88:99:AA:BB:CC:DD:EE:FF:00:11:22:33
-  # optional: Configure a host to relay all outgoing email to.
-  # Incompatible with smtp_outgoing.
-  relay_host: mx.example.org
-  # optional: Files in /etc/postfix ($FILE.crt, $FILE.key) to use as client certificates when
-  # relaying to the relay_host.
-  relay_client_cert: client_cert

 
 apache:
   default_host: www.example.org
 
 apache:
   default_host: www.example.org

+  webmaster: webmaster@example.org
+  server_name: web.example.org

 
 prosody:
   host: jabber.example.org
 
 prosody:
   host: jabber.example.org


@@ -86,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"
 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
   mysql_password: $RANDOM
   admin_password: $RANDOM