try to make data-sample unnecessary and make mail setup work entirely with admin:initServer.sh and admin:addSite.sh
Merge branch 'master' of https://github.com/indiehosters/dockerfiles