From 76d2c779df312e94bd371f9238d717b7e40e8226 Mon Sep 17 00:00:00 2001
From: Josef Friedrich <josef@friedrich.rocks>
Date: Sun, 28 Aug 2016 21:08:37 +0200
Subject: [PATCH] Adjust coding style in "bin" scripts (#279)

The main shell script (start-mailserver.sh) uses two spaces for
indentation. All other shell scripts should use this coding
style.
---
 target/bin/addmailuser          | 35 +++++++-------
 target/bin/delmailuser          | 15 +++---
 target/bin/generate-dkim-config | 84 ++++++++++++++++-----------------
 3 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/target/bin/addmailuser b/target/bin/addmailuser
index 81ba0af0..c0256b05 100755
--- a/target/bin/addmailuser
+++ b/target/bin/addmailuser
@@ -3,27 +3,26 @@
 DATABASE=/tmp/docker-mailserver/postfix-accounts.cf
 
 function usage {
- echo 'Usage: addmailuser <user@domain.tld> [password]'
- exit 1
+  echo 'Usage: addmailuser <user@domain.tld> [password]'
+  exit 1
 }
 
 if [ ! -z "$1" ]; then
- USER=$1
- if [ -e "$DATABASE" ] && [ ! -z "$(grep $USER -i $DATABASE)" ]; then
-  echo "User already exists"
-  exit 1
- fi
- if [ ! -z "$2" ]; then
-  PASS="$2"
- else
-  read -s -p "Enter Password: " PASS
-  if [ -z "$PASS" ]; then 
-   echo "Password can't be empty"
-   exit 1
+  USER=$1
+  if [ -e "$DATABASE" ] && [ ! -z "$(grep $USER -i $DATABASE)" ]; then
+    echo "User already exists"
+    exit 1
   fi
- fi
- ENTRY=$(echo "$USER|$(doveadm pw -s SHA512-CRYPT -u "$USER" -p "$PASS")")
- echo "$ENTRY" >> $DATABASE
+  if [ ! -z "$2" ]; then
+    PASS="$2"
+  else
+    read -s -p "Enter Password: " PASS
+    if [ -z "$PASS" ]; then 
+      echo "Password can't be empty"
+      exit 1
+    fi
+    ENTRY=$(echo "$USER|$(doveadm pw -s SHA512-CRYPT -u "$USER" -p "$PASS")")
+    echo "$ENTRY" >> $DATABASE
 else
- usage
+  usage
 fi
diff --git a/target/bin/delmailuser b/target/bin/delmailuser
index 85bba7b6..b3160ece 100755
--- a/target/bin/delmailuser
+++ b/target/bin/delmailuser
@@ -3,16 +3,19 @@
 DATABASE=/tmp/docker-mailserver/postfix-accounts.cf
 
 function usage {
- echo "Usage: delmailuser <user@domain.tld>"
- exit 1
+  echo "Usage: delmailuser <user@domain.tld>"
+  exit 1
 }
 
 if [ ! -z "$1" ]; then
- USER=$1
- if [ -f "$DATABASE" ]; then
+  USER=$1
   ENTRIES=$(grep "$USER" -vi $DATABASE)
   echo "$ENTRIES" > $DATABASE
- fi
+  USER=$1
+  if [ -f "$DATABASE" ]; then
+    ENTRIES=$(grep "$USER" -vi $DATABASE)
+    echo "$ENTRIES" > $DATABASE
+  fi
 else
- usage
+  usage
 fi
diff --git a/target/bin/generate-dkim-config b/target/bin/generate-dkim-config
index ffcff2b2..31bb9587 100755
--- a/target/bin/generate-dkim-config
+++ b/target/bin/generate-dkim-config
@@ -4,28 +4,28 @@ touch /tmp/vhost.tmp
 
 # Getting domains from mail accounts
 if [ -f /tmp/docker-mailserver/postfix-accounts.cf ]; then
-	while IFS=$'|' read login pass
-	do
-		domain=$(echo ${login} | cut -d @ -f2)
-		echo ${domain} >> /tmp/vhost.tmp
-	done < /tmp/docker-mailserver/postfix-accounts.cf
+  while IFS=$'|' read login pass
+  do
+    domain=$(echo ${login} | cut -d @ -f2)
+    echo ${domain} >> /tmp/vhost.tmp
+  done < /tmp/docker-mailserver/postfix-accounts.cf
 fi
 
 # Getting domains from mail aliases
 if [ -f /tmp/docker-mailserver/postfix-virtual.cf ]; then
-	while read from to
-	do
-		# Setting variables for better readability
-		uname=$(echo ${from} | cut -d @ -f1)
-		domain=$(echo ${from} | cut -d @ -f2)
-		# if they are equal it means the line looks like: "user1     other@domain.tld"
-		test "$uname" != "$domain" && echo ${domain} >> /tmp/vhost.tmp
-	done < /tmp/docker-mailserver/postfix-virtual.cf
+  while read from to
+  do
+    # Setting variables for better readability
+    uname=$(echo ${from} | cut -d @ -f1)
+    domain=$(echo ${from} | cut -d @ -f2)
+    # if they are equal it means the line looks like: "user1     other@domain.tld"
+    test "$uname" != "$domain" && echo ${domain} >> /tmp/vhost.tmp
+  done < /tmp/docker-mailserver/postfix-virtual.cf
 fi
 
 # Keeping unique entries
 if [ -f /tmp/vhost.tmp ]; then
-	cat /tmp/vhost.tmp | sort | uniq > /tmp/vhost && rm /tmp/vhost.tmp
+  cat /tmp/vhost.tmp | sort | uniq > /tmp/vhost && rm /tmp/vhost.tmp
 fi
 
 # Exit if no entries found
@@ -35,39 +35,39 @@ if [ ! -f /tmp/vhost ]; then
 fi
 
 grep -vE '^(\s*$|#)' /tmp/vhost | while read domainname; do
-	mkdir -p /tmp/docker-mailserver/opendkim/keys/$domainname
+  mkdir -p /tmp/docker-mailserver/opendkim/keys/$domainname
 
-	if [ ! -f "/tmp/docker-mailserver/opendkim/keys/$domainname/mail.private" ]; then
-		echo "Creating DKIM private key /tmp/docker-mailserver/opendkim/keys/$domainname/mail.private"
-		opendkim-genkey --subdomains --domain=$domainname --selector=mail -D /tmp/docker-mailserver/opendkim/keys/$domainname
-	fi
+  if [ ! -f "/tmp/docker-mailserver/opendkim/keys/$domainname/mail.private" ]; then
+    echo "Creating DKIM private key /tmp/docker-mailserver/opendkim/keys/$domainname/mail.private"
+    opendkim-genkey --subdomains --domain=$domainname --selector=mail -D /tmp/docker-mailserver/opendkim/keys/$domainname
+  fi
 
-	# Write to KeyTable if necessary
-	keytableentry="mail._domainkey.$domainname $domainname:mail:/etc/opendkim/keys/$domainname/mail.private"
-	if [ ! -f "/tmp/docker-mailserver/opendkim/KeyTable" ]; then
-		echo "Creating DKIM KeyTable"
-		echo $keytableentry > /tmp/docker-mailserver/opendkim/KeyTable
-	else
-		if ! grep -q "$keytableentry" "/tmp/docker-mailserver/opendkim/KeyTable" ; then
-	    	echo $keytableentry >> /tmp/docker-mailserver/opendkim/KeyTable
-		fi
-	fi
+  # Write to KeyTable if necessary
+  keytableentry="mail._domainkey.$domainname $domainname:mail:/etc/opendkim/keys/$domainname/mail.private"
+  if [ ! -f "/tmp/docker-mailserver/opendkim/KeyTable" ]; then
+    echo "Creating DKIM KeyTable"
+    echo $keytableentry > /tmp/docker-mailserver/opendkim/KeyTable
+  else
+    if ! grep -q "$keytableentry" "/tmp/docker-mailserver/opendkim/KeyTable" ; then
+        echo $keytableentry >> /tmp/docker-mailserver/opendkim/KeyTable
+    fi
+  fi
 
-	# Write to SigningTable if necessary
-	signingtableentry="*@$domainname mail._domainkey.$domainname"
-	if [ ! -f "/tmp/docker-mailserver/opendkim/SigningTable" ]; then
-		echo "Creating DKIM SigningTable"
-		echo "*@$domainname mail._domainkey.$domainname" > /tmp/docker-mailserver/opendkim/SigningTable
-	else
-		if ! grep -q "$signingtableentry" "/tmp/docker-mailserver/opendkim/SigningTable" ; then
-	    	echo $signingtableentry >> /tmp/docker-mailserver/opendkim/SigningTable
-		fi
-	fi
+  # Write to SigningTable if necessary
+  signingtableentry="*@$domainname mail._domainkey.$domainname"
+  if [ ! -f "/tmp/docker-mailserver/opendkim/SigningTable" ]; then
+    echo "Creating DKIM SigningTable"
+    echo "*@$domainname mail._domainkey.$domainname" > /tmp/docker-mailserver/opendkim/SigningTable
+  else
+    if ! grep -q "$signingtableentry" "/tmp/docker-mailserver/opendkim/SigningTable" ; then
+      echo $signingtableentry >> /tmp/docker-mailserver/opendkim/SigningTable
+    fi
+  fi
 done
 
 # Creates TrustedHosts if missing
 if [ -d "/tmp/docker-mailserver/opendkim" ] && [ ! -f "/tmp/docker-mailserver/opendkim/TrustedHosts" ]; then
-	echo "Creating DKIM TrustedHosts";
-	echo "127.0.0.1" > /tmp/docker-mailserver/opendkim/TrustedHosts
-	echo "localhost" >> /tmp/docker-mailserver/opendkim/TrustedHosts
+  echo "Creating DKIM TrustedHosts";
+  echo "127.0.0.1" > /tmp/docker-mailserver/opendkim/TrustedHosts
+  echo "localhost" >> /tmp/docker-mailserver/opendkim/TrustedHosts
 fi