Merge pull request #1660 from tomav/aendeavor/renaming

Exchanging `.dist` files

.editorconfig

@@ -10,7 +10,7 @@ insert_final_newline = true
 indent_style = space
 trim_trailing_whitespace = false
 
-[*.{yaml,yml,yml.dist,yml.tmpl}]
+[*.{yaml,yml}]
 indent_style = space
 indent_size = 2
 

.gitignore

@@ -4,9 +4,7 @@
 
 .DS_Store
 .env
-
 config/opendkim/
-docker-compose.yml
 
 #################################################
 ###  IDEs  ######################################

README.md

@@ -90,10 +90,12 @@ Minimum:
 Download the `docker-compose.yml`, `.env`, `env-mailserver` and the `setup.sh` files:
 
 ``` BASH
-curl -o setup.sh https://raw.githubusercontent.com/tomav/docker-mailserver/master/setup.sh && chmod a+x ./setup.sh
-curl -o docker-compose.yml https://raw.githubusercontent.com/tomav/docker-mailserver/master/docker-compose.yml.dist
-curl -o .env https://raw.githubusercontent.com/tomav/docker-mailserver/master/.env.dist
-curl -o env-mailserver https://raw.githubusercontent.com/tomav/docker-mailserver/master/env-mailserver.dist
+wget https://raw.githubusercontent.com/tomav/docker-mailserver/master/setup.sh
+wget https://raw.githubusercontent.com/tomav/docker-mailserver/master/docker-compose.yml
+wget https://raw.githubusercontent.com/tomav/docker-mailserver/master/env-mailserver
+curl -o .env https://raw.githubusercontent.com/tomav/docker-mailserver/master/template.env
+
+chmod a+x ./setup.sh
 ```
 
 ### Create a docker-compose environment

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3.8'
 
 services:
   mail: