From 94772e06baad0df9b60d310bc61067d359eda070 Mon Sep 17 00:00:00 2001 From: Thomas VIAL Date: Tue, 27 Dec 2016 23:05:13 +0100 Subject: [PATCH] Fixing line endings --- Makefile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index d8ddc6a3..1f7e3456 100644 --- a/Makefile +++ b/Makefile @@ -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