From 133d6eba32a98ae4cba4ce152d9b9a79be9fd9df Mon Sep 17 00:00:00 2001
From: Adrian Pistol <vifino@tty.sh>
Date: Tue, 12 Jul 2016 17:40:08 +0200
Subject: [PATCH] Fix some bugs in the shell scripts.

---
 target/bin/addmailuser              | 6 +++---
 target/bin/generate-dkim-config     | 0
 target/bin/generate-ssl-certificate | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 target/bin/generate-dkim-config
 mode change 100644 => 100755 target/bin/generate-ssl-certificate

diff --git a/target/bin/addmailuser b/target/bin/addmailuser
index c9b1ff78..6aeac44f 100755
--- a/target/bin/addmailuser
+++ b/target/bin/addmailuser
@@ -3,7 +3,7 @@
 DATABASE=/tmp/docker-mailserver/postfix-accounts.cf
 
 function usage {
- echo Usage: addmailuser <user@domain.tld> [password]
+ echo 'Usage: addmailuser <user@domain.tld> [password]'
  exit 1
 }
 
@@ -14,7 +14,7 @@ if [ ! -z "$1" ]; then
   exit 1
  fi
  if [ ! -z "$2" ]; then
-  PASS=$2
+  PASS="$2"
  else
   read -s -p "Enter Password: " PASS
   if [ -z "$PASS" ]; then 
@@ -22,7 +22,7 @@ if [ ! -z "$1" ]; then
    exit 1
   fi
  fi
- ENTRY=$(echo "$USER|$(doveadm pw -s SHA512-CRYPT -u $USER -p $PASS)")
+ ENTRY=$(echo "$USER|$(doveadm pw -s SHA512-CRYPT -u "$USER" -p "$PASS")")
  echo "$ENTRY" >> $DATABASE
 else
  usage
diff --git a/target/bin/generate-dkim-config b/target/bin/generate-dkim-config
old mode 100644
new mode 100755
diff --git a/target/bin/generate-ssl-certificate b/target/bin/generate-ssl-certificate
old mode 100644
new mode 100755
index aee67906..c53ab381
--- a/target/bin/generate-ssl-certificate
+++ b/target/bin/generate-ssl-certificate
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-FQDN=$(hostname)
+FQDN=$(hostname --fqdn)
 
 cd /ssl
 # Create CA certificate
@@ -11,4 +11,3 @@ openssl req -new -nodes -keyout /ssl/$FQDN-key.pem -out /ssl/$FQDN-req.pem -days
 openssl ca -out /ssl/$FQDN-cert.pem -infiles /ssl/$FQDN-req.pem
 # Combine certificates for courier
 cat /ssl/$FQDN-key.pem /ssl/$FQDN-cert.pem > /ssl/$FQDN-combined.pem
-