From 8c0cbe2eb3d8ceb56f78590a3a0993430aa664d1 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 28 Jun 2017 18:56:01 +0200
Subject: [PATCH] Fix docs for SSL ADDITIONAL_SAN (using , instead of
 whitespace, no quotes); Autodiscover now uses vars.local.inc.php

---
 docs/firststeps-ssl.md          |  7 ++++++-
 docs/u_e-autodiscover_config.md | 26 ++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/docs/firststeps-ssl.md b/docs/firststeps-ssl.md
index b6797576b..6b007fbaf 100644
--- a/docs/firststeps-ssl.md
+++ b/docs/firststeps-ssl.md
@@ -17,8 +17,13 @@ For every domain you remove, the certificate will be moved and a new certificate
 
 Edit "mailcow.conf" and add a parameter "ADDITIONAL_SAN" like this:
 
+!!! info
+    Make sure you are using acme-mailcow:1.5 or above in docker-compose.yml - if not, update mailcow first!
+
+Do not use quotes (`"`)!
+
 ```
-ADDITIONAL_SAN="cert1.example.org cert1.example.com cert2.example.org cert3.example.org"
+ADDITIONAL_SAN=cert1.example.org,cert1.example.com,cert2.example.org,cert3.example.org
 ```
 
 Each name will be validated against its IPv4 address.
diff --git a/docs/u_e-autodiscover_config.md b/docs/u_e-autodiscover_config.md
index a832b74a8..473006002 100644
--- a/docs/u_e-autodiscover_config.md
+++ b/docs/u_e-autodiscover_config.md
@@ -1,5 +1,27 @@
-This disables ActiveSync in the autodiscover service for Outlook and configures it with IMAP and SMTP instead:
+Open/create `data/web/vars.local.inc.php` and add this configuration array (as a copy of `$autodiscover_config` from `data/web/vars.inc.php`):
 
-Open `data/web/autodiscover.php` and set `'useEASforOutlook' => 'yes'` to `'useEASforOutlook' => 'no'`.
+```
+$autodiscover_config = array(
+  // Enable the autodiscover service for Outlook desktop clients
+  'useEASforOutlook' => 'yes',
+  // General autodiscover service type: "activesync" or "imap"
+  'autodiscoverType' => 'activesync',
+  'imap' => array(
+    'server' => $mailcow_hostname,
+    'port' => getenv('IMAPS_PORT'),
+    'ssl' => 'on',
+  ),
+  'smtp' => array(
+    'server' => $mailcow_hostname,
+    'port' => getenv('SMTPS_PORT'),
+    'ssl' => 'on'
+  ),
+  'activesync' => array(
+    'url' => 'https://'.$mailcow_hostname.'/Microsoft-Server-ActiveSync'
+  )
+);
+```
 
 To always use IMAP and SMTP instead of EAS, set `'autodiscoverType' => 'imap'`.
+
+Disable ActiveSync for Outlook desktop clients by setting "useEASforOutlook" to "no".
\ No newline at end of file