Merge branch 'master' into feature/all

ecs/README.md

@@ -1,3 +1,10 @@
+
+[![Docker Stars](https://img.shields.io/docker/stars/ejabberd/ecs.svg)](https://hub.docker.com/r/ejabberd/ecs/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/ejabberd/ecs.svg)](https://hub.docker.com/r/ejabberd/ecs/)
+[![](https://images.microbadger.com/badges/version/ejabberd/ecs.svg)](https://microbadger.com/images/ejabberd/ecs)
+[![](https://images.microbadger.com/badges/image/ejabberd/ecs.svg)](https://microbadger.com/images/ejabberd/ecs)
+[![GitHub stars](https://img.shields.io/github/stars/processone/docker-ejabberd.svg?style=social)](https://github.com/processone/docker-ejabberd)
+
 ## ejabberd Community Server - Base
 
 This ejabberd Docker image allows you to run a single node ejabberd instance in a Docker container.

ecs/conf/ejabberd.yml

@@ -38,11 +38,16 @@ log_rate_limit: 100
 
 certfiles:
   - "/home/ejabberd/conf/server.pem"
-##  - "/etc/letsencrypt/live/localhost/fullchain.pem"
-##  - "/etc/letsencrypt/live/localhost/privkey.pem"
 
 ca_file: "/home/ejabberd/conf/cacert.pem"
 
+# When using let's encrypt to generate certificates
+##certfiles:
+##  - "/etc/letsencrypt/live/localhost/cert.pem"
+##  - "/etc/letsencrypt/live/localhost/privkey.pem"
+##
+##ca_file: "/etc/letsencrypt/live/localhost/fullchain.pem"
+
 listen:
   -
     port: 5222

mix/README.md

@@ -1,3 +1,10 @@
+
+[![Docker Stars](https://img.shields.io/docker/stars/ejabberd/mix.svg)](https://hub.docker.com/r/ejabberd/mix/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/ejabberd/mix.svg)](https://hub.docker.com/r/ejabberd/mix/)
+[![](https://images.microbadger.com/badges/version/ejabberd/mix.svg)](https://microbadger.com/images/ejabberd/mix)
+[![](https://images.microbadger.com/badges/image/ejabberd/mix.svg)](https://microbadger.com/images/ejabberd/mix)
+[![GitHub stars](https://img.shields.io/github/stars/processone/docker-ejabberd.svg?style=social)](https://github.com/processone/docker-ejabberd)
+
 ## Docker image for ejabberd developers
 
 Thanks to this image, you can build ejabberd with dependencies provided in Docker image, without the need to install build software (beside Docker) directly on your own machine.