From 266fecd4810ce658831fd8903c449e90d25833eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Peters?= <andre.peters@debinux.de>
Date: Thu, 2 Jul 2020 08:45:17 +0200
Subject: [PATCH 1/3] Update firststeps-ssl.md

---
 docs/firststeps-ssl.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/firststeps-ssl.md b/docs/firststeps-ssl.md
index 2b8de4bd7..9b0470fc4 100644
--- a/docs/firststeps-ssl.md
+++ b/docs/firststeps-ssl.md
@@ -19,7 +19,7 @@ If you want to re-run the ACME client, use `docker-compose restart acme-mailcow`
 
 Edit "mailcow.conf" and add a parameter `ADDITIONAL_SAN` like this:
 
-Do not use quotes (`"`)!
+Do not use quotes (`"`) and do not use spaces between the names!
 
 ```
 ADDITIONAL_SAN=smtp.*,cert1.example.com,cert2.example.org,whatever.*

From 324dc2231b2ec6224d341dce4b810c1167087703 Mon Sep 17 00:00:00 2001
From: Johan <johanvandyck@users.noreply.github.com>
Date: Thu, 2 Jul 2020 17:49:24 +0200
Subject: [PATCH 2/3] Update third_party-roundcube.md: managesieve

The current doc gives "cannot connect to db" in Roundcube 1.4.6, managesieve. The config should be placed in the plugin itself and not in the general config file of Roundcube.
---
 docs/third_party-roundcube.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/docs/third_party-roundcube.md b/docs/third_party-roundcube.md
index 091583d59..910fe1ae9 100644
--- a/docs/third_party-roundcube.md
+++ b/docs/third_party-roundcube.md
@@ -44,7 +44,18 @@ $config['enable_installer'] = true;
 $config['smtp_conn_options'] = array(
   'ssl' => array('verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true)
 );
+$config['db_prefix'] = 'mailcow_rc1';
+```
 
+Point your browser to `https://myserver/rc/installer` and follow the instructions.
+Initialize the database and leave the installer.
+
+**Delete the directory `data/web/rc/installer` after a successful installation!**
+
+### Configure ManageSieve filtering
+
+Open `data/web/rc/plugins/managesieve/config.inc.php` and change the following parameters (or add them at the bottom of that file):
+```
 $config['managesieve_port'] = 4190;
 $config['managesieve_host'] = 'tls://dovecot';
 $config['managesieve_conn_options'] = array(
@@ -55,15 +66,8 @@ $config['managesieve_conn_options'] = array(
 // 1 - add Vacation section,
 // 2 - add Vacation section, but hide Filters section
 $config['managesieve_vacation'] = 1;
-$config['db_prefix'] = 'mailcow_rc1';
-
 ```
 
-Point your browser to `https://myserver/rc/installer` and follow the instructions.
-Initialize the database and leave the installer.
-
-**Delete the directory `data/web/rc/installer` after a successful installation!**
-
 ### Enable change password function in Roundcube
 
 Open `data/web/rc/config/config.inc.php` and enable the password plugin:

From 5c2f924877a1c8815eec00a42a3366639538f518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Peters?= <andre.peters@debinux.de>
Date: Fri, 3 Jul 2020 08:58:46 +0200
Subject: [PATCH 3/3] Update firststeps-ssl.md

---
 docs/firststeps-ssl.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/firststeps-ssl.md b/docs/firststeps-ssl.md
index 9b0470fc4..705f1343e 100644
--- a/docs/firststeps-ssl.md
+++ b/docs/firststeps-ssl.md
@@ -110,6 +110,24 @@ docker restart $(docker ps -qaf name=dovecot-mailcow)
 
 See https://mailcow.github.io/mailcow-dockerized-docs/firststeps-rp/#optional-post-hook-script-for-non-mailcow-acme-clients for a full example script.
 
+### Test against staging ACME directory
+
+Edit `mailcow.conf` and add `LE_STAGING=y`.
+
+Run `docker-compose up -d` to activate your changes.
+
+### Custom directory URL
+
+Edit `mailcow.conf` and add the corresponding directory URL to the new variable `DIRECTORY_URL`:
+
+```
+DIRECTORY_URL=https://acme-custom-v9000.api.letsencrypt.org/directory
+```
+
+You cannot use `LE_STAGING` with `DIRECTORY_URL`. If both are set, only `LE_STAGING` is used.
+
+Run `docker-compose up -d` to activate your changes.
+
 ### Check your configuration
 
 Run `docker-compose logs acme-mailcow` to find out why a validation fails.