From 19ed10078f3daa2235257b7646a55a214adf9a5b Mon Sep 17 00:00:00 2001
From: Pastilhas <up201704982@fe.up.pt>
Date: Sun, 22 Nov 2020 22:13:47 +0000
Subject: [PATCH] [DOCKER][MAIL] User is now created on setup and Dockerfile
 Continuation of previous commit

---
 docker/mail/.gitignore                        |  2 -
 docker/mail/Dockerfile                        |  7 ++-
 docker/mail/config/aliases                    |  0
 docker/mail/config/domains                    |  0
 docker/mail/config/mailboxes                  |  0
 docker/mail/config/passwd                     |  0
 .../mail/config/supervisord/supervisord.conf  | 46 -------------------
 docker/mail/setup.sh                          | 11 +++--
 8 files changed, 9 insertions(+), 57 deletions(-)
 delete mode 100644 docker/mail/.gitignore
 delete mode 100644 docker/mail/config/aliases
 delete mode 100644 docker/mail/config/domains
 delete mode 100644 docker/mail/config/mailboxes
 delete mode 100644 docker/mail/config/passwd
 delete mode 100644 docker/mail/config/supervisord/supervisord.conf

diff --git a/docker/mail/.gitignore b/docker/mail/.gitignore
deleted file mode 100644
index e78d74c1ac..0000000000
--- a/docker/mail/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-mail.env
-config/*
diff --git a/docker/mail/Dockerfile b/docker/mail/Dockerfile
index 24105734e6..131d1da301 100644
--- a/docker/mail/Dockerfile
+++ b/docker/mail/Dockerfile
@@ -42,11 +42,10 @@ RUN \
 	&& chmod +x "/etc/service/rsyslog/run"
 
 # Prepare user
-RUN \
-	mkdir -p "/var/mail/${DOMAINNAME}" \
-	&& mkdir -p "/var/mail/${DOMAINPART}/${USER@*}" \
+RUN mkdir -p "/var/mail/${DOMAINNAME}" \
+	&& mkdir -p "/var/mail/${DOMAINPART}/${USER%@*}" \
 	&& chown vmail:vmail "/var/mail/${DOMAINNAME}" \
-	&& chown vmail:vmail "/var/mail/${DOMAINPART}/${USER@*}"
+	&& chown vmail:vmail "/var/mail/${DOMAINPART}/${USER%@*}"
 
 # Expose ports
 EXPOSE 25 110 143 587 993 995
diff --git a/docker/mail/config/aliases b/docker/mail/config/aliases
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docker/mail/config/domains b/docker/mail/config/domains
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docker/mail/config/mailboxes b/docker/mail/config/mailboxes
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docker/mail/config/passwd b/docker/mail/config/passwd
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docker/mail/config/supervisord/supervisord.conf b/docker/mail/config/supervisord/supervisord.conf
deleted file mode 100644
index e4501f8693..0000000000
--- a/docker/mail/config/supervisord/supervisord.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-[unix_http_server]
-file=/tmp/supervisor.sock
-
-[supervisord]
-nodaemon=true
-user=root
-loglevel=warn
-
-[supervisorctl]
-serverurl=unix:///tmp/supervisor.sock
-user=root
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[program:opendkim]
-autostart=false
-autorestart=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-command=/usr/sbin/opendkim -x /etc/mail/opendkim/opendkim.conf
-
-[program:postfix]
-autostart=false
-autorestart=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-command=postfix -c /etc/mail/postfix/postfix.conf
-
-[program:dovecot]
-autostart=false
-autorestart=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-command=dovecot -c /etc/mail/dovecot/dovecot.conf
-
-[program:rsyslog]
-autostart=false
-autorestart=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-command=rsyslog -f /etc/mail/rsyslogd/rsyslog.conf
diff --git a/docker/mail/setup.sh b/docker/mail/setup.sh
index dabe7497db..9df2646137 100644
--- a/docker/mail/setup.sh
+++ b/docker/mail/setup.sh
@@ -24,6 +24,7 @@ DOMAINNAME=${domain_root}
 MAILNAME=${domain}
 SSL_CERT=/etc/letsencrypt/live/${domain_root}/fullchain.pem
 SSL_KEY=/etc/letsencrypt/live/${domain_root}/privkey.pem
+USER="${user}@${domain_root}"
 EOF
 
 DOMAINNAME="${domain_root}"
@@ -32,7 +33,7 @@ SSL_CERT="/etc/letsencrypt/live/${domain_root}/fullchain.pem"
 SSL_KEY="/etc/letsencrypt/live/${domain_root}/privkey.pem"
 
 USER="${user}@${DOMAINNAME}"
-PASS=$(mkpasswd -m sha-512 -S "" -R 5000 ${pass})
+PASSHASH=$(mkpasswd -m sha-512 -S "" -R 5000 ${pass})
 
 # Config postfix
 sed -i -e "s#^\s*myhostname\s*=.*#myhostname = ${MAILNAME}#" config/postfix/main.cf
@@ -50,7 +51,7 @@ sed -i -e "s/^.*#HOSTNAME/${MAILNAME}#HOSTNAME/" config/opendkim/TrustedHosts
 
 # Prepare mail user
 touch config/aliases config/domains config/mailboxes config/passwd
-echo "${DOMAINNAME}  #OK" >> config/domains
-echo "${USER}  ${USER}" >> config/aliases
-echo "${USER}  ${DOMAINNAME}/${user}/" >> config/mailboxes
-echo "${USER}:${PASSHASH}" >> config/passwd
+echo "${DOMAINNAME}  #OK" > config/domains
+echo "${USER}  ${USER}" > config/aliases
+echo "${USER}  ${DOMAINNAME}/${user}/" > config/mailboxes
+echo "${USER}:${PASSHASH}" > config/passwd