Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing line endings

This commit is contained in:
Thomas VIAL 2016-12-27 23:05:13 +01:00
parent 4660acbb7e
commit 94772e06ba
No known key found for this signature in database
GPG Key ID: 0394CEE552FAFEFC
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -19,8 +19,8 @@ generate-accounts:
run:
ifeq ($(ENABLE_LDAP),1)
# Run ldap
docker run -d --name ldap_for_mail \
-e LDAP_DOMAIN="localhost.localdomain" \
docker run -d --name ldap_for_mail \
-e LDAP_DOMAIN="localhost.localdomain" \
-h mail.my-domain.com -t ldap ;
endif
@ -37,15 +37,15 @@ endif
-e ENABLE_FETCHMAIL=$(ENABLE_FETCHMAIL) \
-e ONE_DIR=$(ONE_DIR) \
-e PERMIT_DOCKER=$(PERMIT_DOCKER) \
-e ENABLE_LDAP=$(ENABLE_LDAP) \
-e LDAP_SERVER_HOST=$(LDAP_SERVER_HOST) \
-e LDAP_SEARCH_BASE=$(LDAP_SEARCH_BASE) \
-e LDAP_BIND_DN=$(LDAP_BIND_DN) \
-e ENABLE_SASLAUTHD=$(ENABLE_SASLAUTHD) \
-e SASLAUTHD_MECHANISMS=$(SASLAUTHD_MECHANISMS) \
-e SASLAUTHD_LDAP_SERVER=$(SASLAUTHD_LDAP_SERVER) \
-e SASLAUTHD_LDAP_BIND_DN=$(SASLAUTHD_LDAP_BIND_DN) \
-e SASLAUTHD_LDAP_PASSWORD=$(SASLAUTHD_LDAP_PASSWORD) \
-e ENABLE_LDAP=$(ENABLE_LDAP) \
-e LDAP_SERVER_HOST=$(LDAP_SERVER_HOST) \
-e LDAP_SEARCH_BASE=$(LDAP_SEARCH_BASE) \
-e LDAP_BIND_DN=$(LDAP_BIND_DN) \
-e ENABLE_SASLAUTHD=$(ENABLE_SASLAUTHD) \
-e SASLAUTHD_MECHANISMS=$(SASLAUTHD_MECHANISMS) \
-e SASLAUTHD_LDAP_SERVER=$(SASLAUTHD_LDAP_SERVER) \
-e SASLAUTHD_LDAP_BIND_DN=$(SASLAUTHD_LDAP_BIND_DN) \
-e SASLAUTHD_LDAP_PASSWORD=$(SASLAUTHD_LDAP_PASSWORD) \
-e SASLAUTHD_LDAP_SEARCH_BASE=$(SASLAUTHD_LDAP_SEARCH_BASE) \
-e SMTP_ONLY=$(SMTP_ONLY) \
-e SA_TAG=$(SA_TAG) \
@ -57,7 +57,6 @@ endif
--cap-add=NET_ADMIN \
-h mail.my-domain.com -t $(NAME)
# Wait for containers to fully start
sleep 15