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

docs/client/client-apple.md

@@ -1,11 +1,23 @@
-## Method 1 (IMAP, SMTP, DAV)
+## Method 1 via Mobileconfig
 
-Email, contacts and calendar can be configured automatically on Apple devices by installing a profile. It configure IMAP, CardDAV and CalDAV.
+Email, contacts and calendars can be configured automatically on Apple devices by installing a profile.
+
+## Method 1.1: IMAP, SMTP and Cal/CardDAV
+
+This method configures IMAP, CardDAV and CalDAV.
 
 1. Download and open <span class="client_variables_unavailable">the file from <i>https://${MAILCOW_HOSTNAME}/mobileconfig.php</i></span><span class="client_variables_available"><a class="client_var_link" href="mobileconfig.php">mailcow.mobileconfig</a></span>.
 2. Enter the unlock code (iPhone) or computer password (Mac).
 3. Enter your email password three times when prompted.
 
+## Method 1.2: IMAP only
+
+This method configures IMAP only.
+
+1. Download and open <span class="client_variables_unavailable">the file from <i>https://${MAILCOW_HOSTNAME}/mobileconfig.php?only_email</i></span><span class="client_variables_available"><a class="client_var_link" href="mobileconfig.php">mailcow.mobileconfig</a></span>.
+2. Enter the unlock code (iPhone) or computer password (Mac).
+3. Enter your email password when prompted.
+
 ## Method 2 (Exchange ActiveSync emulation)
 
 On iOS, Exchange ActiveSync is also supported as an alternative to the procedure above. It has the advantage of supporting push email (i.e. you are immediately notified of incoming messages), but has some limitations, e.g. it does not support more than three email addresses per contact in your address book. Follow the steps below if you decide to use Exchange instead.

docs/firststeps-logging.md

@@ -1,6 +1,7 @@
 Logging in mailcow: dockerized consists of multiple stages, but is, after all, much more flexible and easier to integrate into a logging daemon than before.
 
 In Docker the containerized application (PID 1) writes its output to stdout. For real one-application containers this works just fine.
+Run `docker-compose logs --help` to learn more. 
 
 Some containers log or stream to multiple destinations.
 

docs/firststeps-sync_jobs_migration.md

@@ -0,0 +1,22 @@
+Sync jobs are used to copy or move existing emails from an external IMAP server or within mailcow's existing mailboxes.
+
+!!! info
+    Depending on your mailbox's ACL you may not have the option to add a sync job. Please contact your domain administrator if so.
+
+## Setup a Sync Job
+1. In the "Mail Setup" or "User Settings" interface, create a new sync job.
+
+2. If you are an administrator, select the username of the downstream mailcow mailbox in the "Username" dropdown.
+
+3. Fill in the "Host" and "Port" fields with their respective correct values from the upstream IMAP server.
+
+4. In the "Username" and 'Password" fields, supply the correct access credentials from the upstream IMAP server.
+
+5. Select the "Encryption Method". If the upstream IMAP server uses port 143, it is likely that the encryption method is TLS and SSL for port 993. Nevertheless, you can use PLAIN authentication, but it is stongly discouraged.
+
+6. For all ther other fields, you can leave them as is or modify them as desired.
+
+7. Make sure to tick "Active" and click "Add".
+
+!!! info
+    Once Completed, log into the mailbox and check if all emails are imported correctly. If all goes well, All your mails shall end up in your new mailbox. And don't forget to delete or deactivate the sync job after it is used.

docs/model-sender_rcv.md

@@ -17,7 +17,7 @@ We can add aliases for a mailbox to receive mail for and to send from this new a
 It is important to know, that you are not able to receive mail for `my-alias@my-alias-domain.tld`. You would need to create this particular alias.
 
     me@example.org is assigned the alias alias@example.org
-    me@example.org is now known as alias@example.org, me@alias.com, alias@example.org
+    me@example.org is now known as me@example.org, me@alias.com, alias@example.org
 
     me@example.org is NOT known as alias@alias.com.
 

docs/prerequisite-dns.md

@@ -72,7 +72,7 @@ Here are some tools you can use to verify your DNS configuration:
 - [MX Toolbox](https://mxtoolbox.com/SuperTool.aspx) (DNS, SMTP, RBL)
 - [port25.com](https://www.port25.com/dkim-wizard/) (DKIM, SPF)
 - [Mail-tester](https://www.mail-tester.com/) (DKIM, DMARC, SPF)
-- [DMARC Analyzer](https://www.dmarcanalyzer.com/spf-record-check/) (DMARC, SPF)
+- [DMARC Analyzer](https://www.dmarcanalyzer.com/spf/checker/) (DMARC, SPF)
 
 ## Misc
 

docs/third_party-gitea.md

@@ -7,7 +7,7 @@ version: '2.1'
 services:
 
 		gitea-mailcow:
-			image: gitea/gitea:latest
+			image: gitea/gitea:1
 			volumes:
 				- ./data/gitea:/data
 			networks:
@@ -49,4 +49,4 @@ SSH_PORT = 4000
 ROOT_URL = https://mx.example.org/gitea/
 ```
 
-9\. Restart gitea with `docker-compose restart gitea-mailcow`. Your users should be able to login with mailcow managed accounts.
+9\. Restart gitea with `docker-compose restart gitea-mailcow`. Your users should be able to login with mailcow managed accounts.

docs/third_party-roundcube.md

@@ -28,21 +28,34 @@ $config['smtp_user'] = '%u';
 $config['smtp_pass'] = '%p';
 $config['support_url'] = '';
 $config['product_name'] = 'Roundcube Webmail';
-$config['des_key'] = 'rcmail-!24ByteDESkey*Str';
+$config['des_key'] = 'yourrandomstring_changeme';
 $config['log_dir'] = '/dev/null';
 $config['temp_dir'] = '/tmp';
 $config['plugins'] = array(
-    'archive',
+  'archive',
+  'managesieve'
 );
 $config['skin'] = 'larry';
 $config['mime_types'] = '/tmp/mime.types';
 $config['imap_conn_options'] = array(
-'ssl' => array('verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true)
+  'ssl' => array('verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true)
 );
 $config['enable_installer'] = true;
 $config['smtp_conn_options'] = array(
-'ssl' => array('verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true)
+  'ssl' => array('verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true)
 );
+
+$config['managesieve_port'] = 4190;
+$config['managesieve_host'] = 'tls://dovecot';
+$config['managesieve_conn_options'] = array(
+  'ssl' => array('verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true)
+);
+// Enables separate management interface for vacation responses (out-of-office)
+// 0 - no separate section (default),
+// 1 - add Vacation section,
+// 2 - add Vacation section, but hide Filters section
+$config['managesieve_vacation'] = 1;
+
 ```
 
 Point your browser to `https://myserver/rc/installer` and follow the instructions.

docs/u_e-dovecot-any_acl.md

@@ -1,30 +1,9 @@
-On August the 17th, we disabled the possibility to share with "any" or "all authenticated users" in Dovecot by default.
+On August the 17th, we disabled the possibility to share with "any" or "all authenticated users" by default.
 
-## Re-enable "any" ACL in Dovecot
-
-Open `data/conf/dovecot/dovecot.conf`:
-```
-# Allow "any" or "authenticated" to be used in ACLs
-#acl_anyone = allow
-```
-Remove "#" from "acl_anyone" and restart Dovecot by running `docker-compose restart dovecot-mailcow`.
-
-## Re-enable "any" ACL field in SOGo
-
-We have not yet made it an optional setting. But you can still rebuild sogo-mailcow with a slight change to 
-
-Open `data/Dockerfiles/sogo/bootstrap-sogo.sh` and comment out the following code:
+This function can be re-enabled by setting `ACL_ANYONE` to `allow` in mailcow.conf:
 
 ```
-if patch -sfN --dry-run /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff > /dev/null; then
-  patch /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff;
-fi
-```
-
-Rebuild sogo-mailcow and update the stack:
-
-```
-docker-compose build sogo-mailcow
-docker-compose up -d
+ACL_ANYONE=allow
 ```
 
+Apply the changes by running `docker-compose up -d`.

docs/u_e-rspamd.md

@@ -34,4 +34,16 @@ docker-compose exec rspamd-mailcow rspamc --help
 docker-compose exec rspamd-mailcow rspamadm --help
 ```
 
+## Disable Greylisting
+
+You can disable rspamd's greylisting server-wide by editing:
+
+`{mailcow-dir}/data/conf/rspamd/local.d/greylist.conf`
+
+Simply add the line:
+
+`enabled = false;`
+
+Save the file and then restart the rspamd container.
+
 See [Rspamd documentation](https://rspamd.com/doc/index.html)

mkdocs.yml

@@ -36,6 +36,7 @@ nav:
   - 'Setup a relayhost': 'firststeps-relayhost.md'
   - 'Logging': 'firststeps-logging.md'
   - 'Local MTA on Docker host': 'firststeps-local_mta.md'
+  - 'Sync Jobs Migration': 'firststeps-sync_jobs_migration.md'
 - 'Models':
   - 'Sender and receiver model': 'model-sender_rcv.md'
   - 'ACL': 'model-acl.md'