Merge branch 'v1.1' of https://git.in-ulm.de/ulpeters/ejabberd into v1.1

docker-compose.yml

@@ -21,7 +21,8 @@ services:
     command: foreground
 
     healthcheck:
-      test: ["CMD", "nc", "-z", "ejabberd:5347"]
+#      test: ["CMD", "nc", "-z", "ejabberd:5347"]
+      test: /home/ejabberd/bin/ejabberdctl status | grep -q started
       interval: 15s #interval for the first and subsequent checks
       timeout: 10s
       retries: 3