Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized-docs

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.*
@@ -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.

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: