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

Conflicts:
	docs/u_and_e.md

docs/u_and_e.md

@@ -38,9 +38,10 @@ cd /path/to/mailcow-dockerized
 source mailcow.conf
 DATE=$(date +"%Y%m%d_%H%M%S")
 docker run --rm -it -v $(docker inspect --format '{{ range .Mounts }}{{ if eq .Destination "/var/vmail" }}{{ .Name }}{{ end }}{{ end }}' $(docker-compose ps -q dovecot-mailcow)):/vmail -v ${PWD}:/backup debian:jessie tar xvfz /backup/backup_vmail.tar.gz
-```
+```
 
 ## Docker Compose Bash completion
+
 For the tab-tab... :-)
 
 ```
@@ -51,6 +52,7 @@ curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose versio
 Edit a domain as (domain) administrator to add an item to the filter table.
 
 Beware that a mailbox user can login to mailcow and override a domain policy filter item. 
+<<<<<<< HEAD
 
 ## Change default language
 
@@ -61,7 +63,6 @@ Create a file `data/web/inc/vars.local.inc.php` and add "DEFAULT_LANG" with eith
 <?php
 $DEFAULT_LANG = "de";
 ```
-
 ## Change UI theme
 
 mailcow uses [Bootstrap](http://getbootstrap.com/), a HTML, CSS, and JS framework.
@@ -85,7 +86,7 @@ Now auto-recreate modified containers:
 docker-compose up -d
 ```
 
-## Disable sender addresses verification
+## Disable sender addresses verification
 
 This option is not best-practice and should only be implemented when there is no other option available to archive whatever you are trying to do.
 
@@ -105,7 +106,7 @@ Run postmap on check_sasl_access:
 docker-compose exec postfix-mailcow postmap /opt/postfix/conf/check_sasl_access
 ``` 
 
-Restart the Postfix container.
+Restart the Postfix container.
 
 ## Install Roundcube
 
@@ -163,7 +164,7 @@ Initialize the database and leave the installer.
 
 ### Enable change password function in Roundcube
 
-Open `data/web/rc/config.inc.php` and enable the password plugin:
+Open `data/web/rc/config/config.inc.php` and enable the password plugin:
 
 ```
 ...
@@ -244,7 +245,7 @@ Restart the stack, changed containers will be updated:
 
 `docker-compose up -d`
 
-## Redis
+## Redis
 
 ### Client
 
@@ -252,7 +253,7 @@ Restart the stack, changed containers will be updated:
 docker-compose exec redis-mailcow redis-cli
 ```
 
-## Remove persistent data
+## Remove persistent data
 
 - Remove volume `mysql-vol-1` to remove all MySQL data.
 - Remove volume `redis-vol-1` to remove all Redis data.
@@ -271,7 +272,7 @@ source mailcow.conf
 docker-compose exec mysql-mailcow mysql -u${DBUSER} -p${DBPASS} ${DBNAME} -e "DROP TABLE admin;"
 ```
 
-2\. Open mailcow UI to auto-init the db
+2\. Open mailcow UI to auto-init the db
 
 ## Rspamd
 
@@ -296,86 +297,88 @@ docker-compose exec rspamd-mailcow rspamadm --help
 See [Rspamd documentation](https://rspamd.com/doc/index.html)
 
 ## Adjust service configurations
-The most important configuration files are mounted from the host into the related containers:
-```
-data/conf
-├── bind9
-│   └── named.conf
-├── dovecot
-│   ├── dovecot.conf
-│   ├── dovecot-master.passwd
-│   ├── sieve_after
-│   └── sql
-│       ├── dovecot-dict-sql.conf
-│       └── dovecot-mysql.conf
-├── mysql
-│   └── my.cnf
-├── nginx
-│   ├── dynmaps.conf
-│   ├── site.conf
-│   └── templates
-│       ├── listen_plain.template
-│       ├── listen_ssl.template
-│       └── server_name.template
-├── pdns
-│   ├── pdns_custom.lua
-│   └── recursor.conf
-├── postfix
-│   ├── main.cf
-│   ├── master.cf
-│   ├── postscreen_access.cidr
-│   ├── smtp_dsn_filter
-│   └── sql
-│       ├── mysql_relay_recipient_maps.cf
-│       ├── mysql_tls_enforce_in_policy.cf
-│       ├── mysql_tls_enforce_out_policy.cf
-│       ├── mysql_virtual_alias_domain_catchall_maps.cf
-│       ├── mysql_virtual_alias_domain_maps.cf
-│       ├── mysql_virtual_alias_maps.cf
-│       ├── mysql_virtual_domains_maps.cf
-│       ├── mysql_virtual_mailbox_maps.cf
-│       ├── mysql_virtual_relay_domain_maps.cf
-│       ├── mysql_virtual_sender_acl.cf
-│       └── mysql_virtual_spamalias_maps.cf
-├── rmilter
-│   └── rmilter.conf
-├── rspamd
-│   ├── dynmaps
-│   │   ├── authoritative.php
-│   │   ├── settings.php
-│   │   ├── tags.php
-│   │   └── vars.inc.php -> ../../../web/inc/vars.inc.php
-│   ├── local.d
-│   │   ├── dkim.conf
-│   │   ├── metrics.conf
-│   │   ├── options.inc
-│   │   ├── redis.conf
-│   │   ├── rspamd.conf.local
-│   │   └── statistic.conf
-│   ├── lua
-│   │   └── rspamd.local.lua
-│   └── override.d
-│       ├── logging.inc
-│       ├── worker-controller.inc
-│       └── worker-normal.inc
-└── sogo
-    ├── sieve.creds
-    └── sogo.conf
-
-```
-
-Just change the according configuration file on the host and restart the related service:
-```
-docker-compose restart service-mailcow
-```
+
+The most important configuration files are mounted from the host into the related containers:
+
+```
+data/conf
+├── bind9
+│   └── named.conf
+├── dovecot
+│   ├── dovecot.conf
+│   ├── dovecot-master.passwd
+│   ├── sieve_after
+│   └── sql
+│       ├── dovecot-dict-sql.conf
+│       └── dovecot-mysql.conf
+├── mysql
+│   └── my.cnf
+├── nginx
+│   ├── dynmaps.conf
+│   ├── site.conf
+│   └── templates
+│       ├── listen_plain.template
+│       ├── listen_ssl.template
+│       └── server_name.template
+├── pdns
+│   ├── pdns_custom.lua
+│   └── recursor.conf
+├── postfix
+│   ├── main.cf
+│   ├── master.cf
+│   ├── postscreen_access.cidr
+│   ├── smtp_dsn_filter
+│   └── sql
+│       ├── mysql_relay_recipient_maps.cf
+│       ├── mysql_tls_enforce_in_policy.cf
+│       ├── mysql_tls_enforce_out_policy.cf
+│       ├── mysql_virtual_alias_domain_catchall_maps.cf
+│       ├── mysql_virtual_alias_domain_maps.cf
+│       ├── mysql_virtual_alias_maps.cf
+│       ├── mysql_virtual_domains_maps.cf
+│       ├── mysql_virtual_mailbox_maps.cf
+│       ├── mysql_virtual_relay_domain_maps.cf
+│       ├── mysql_virtual_sender_acl.cf
+│       └── mysql_virtual_spamalias_maps.cf
+├── rmilter
+│   └── rmilter.conf
+├── rspamd
+│   ├── dynmaps
+│   │   ├── authoritative.php
+│   │   ├── settings.php
+│   │   ├── tags.php
+│   │   └── vars.inc.php -> ../../../web/inc/vars.inc.php
+│   ├── local.d
+│   │   ├── dkim.conf
+│   │   ├── metrics.conf
+│   │   ├── options.inc
+│   │   ├── redis.conf
+│   │   ├── rspamd.conf.local
+│   │   └── statistic.conf
+│   ├── lua
+│   │   └── rspamd.local.lua
+│   └── override.d
+│       ├── logging.inc
+│       ├── worker-controller.inc
+│       └── worker-normal.inc
+└── sogo
+    ├── sieve.creds
+    └── sogo.conf
+
+```
+
+Just change the according configuration file on the host and restart the related service:
+```
+docker-compose restart service-mailcow
+```
 
 ## Tagging
 
 Mailbox users can tag their mail address like in `me+facebook@example.org` and choose between to setups to handle this tag:
 
-1\. Move this message to a subfolder "facebook" (will be created lower case if not existing)
+1\. Move this message to a subfolder "facebook" (will be created lower case if not existing)
 
-2\. Prepend the tag to the subject: "[facebook] Subject"
+2\. Prepend the tag to the subject: "[facebook] Subject"
 
 ## Two-factor authentication
 
@@ -398,9 +401,10 @@ The API ID, API key and the first 12 characters (your YubiKeys ID in modhex) are
 
 Only Google Chrome (+derivates) and Opera support U2F authentication to this day natively.
 For Firefox you will need to install the "U2F Support Add-on" as provided on [mozilla.org](https://addons.mozilla.org/en-US/firefox/addon/u2f-support-add-on/).
+
 U2F works without an internet connection.
 
-## Why Bind?
+## Why Bind?
 
 For DNS blacklist lookups and DNSSEC.