From 04d3af9fdbb1bde64419df845443be5bc65cf72e Mon Sep 17 00:00:00 2001
From: Fernando Alegre <fernando@mail.alemor.org>
Date: Sat, 20 Jun 2020 20:05:24 +0000
Subject: [PATCH] Moved db to etc

---
 src/mailsrv/Containerfile     | 10 +++++-----
 src/mailsrv/assets/bin/mkvirt |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mailsrv/Containerfile b/src/mailsrv/Containerfile
index 6ed718e..8e74fb7 100644
--- a/src/mailsrv/Containerfile
+++ b/src/mailsrv/Containerfile
@@ -10,7 +10,7 @@ LABEL deployopts="\
 -p 587:587 \
 -p 143:143 \
 -p 993:993 \
--v /srv/vol/mailsrv/db:/vol/db \
+-v /srv/vol/mailsrv/etc:/vol/etc \
 -v /srv/vol/mailsrv/mail:/vol/mail \
 -v /srv/vol/mailsrv/ssl:/vol/ssl:ro"
 
@@ -66,8 +66,8 @@ RUN ln -s /vol/mail /var/mail/virtual
 ### Working Directory
 ###
 
-# make sure /vol/db exists
-RUN mkdir -p /vol/db
+# make sure /vol/etc exists
+RUN mkdir -p /vol/etc
 
-# set /vol/db as working directory
-WORKDIR /vol/db
+# set /vol/etc as working directory
+WORKDIR /vol/etc
diff --git a/src/mailsrv/assets/bin/mkvirt b/src/mailsrv/assets/bin/mkvirt
index 5042b76..4c07ae0 100755
--- a/src/mailsrv/assets/bin/mkvirt
+++ b/src/mailsrv/assets/bin/mkvirt
@@ -6,24 +6,24 @@ set -e
 ### Users ###
 
 # copy users db to dovecot config
-cp /vol/db/users /etc/dovecot/users
+cp /vol/etc/users /etc/dovecot/users
 chown dovecot:dovecot /etc/dovecot/users
 
 # copy users db to postfix config, but without passwords
-cat /vol/db/users | cut -d':' -f1 | perl -pe 's/(.*)/\1 ./' > /etc/postfix/users
+cat /vol/etc/users | cut -d':' -f1 | perl -pe 's/(.*)/\1 ./' > /etc/postfix/users
 postmap /etc/postfix/users
 
 ### Aliases ###
 
 # copy aliases to postifx config
 cd /etc/postfix
-cat /vol/db/aliases.d/*.list > aliases
+cat /vol/etc/aliases.d/*.list > aliases
 postmap aliases
 
 ### Sieve ###
 
 # copy users sieve to mail
-cd /vol/db/sieve.d
+cd /vol/etc/sieve.d
 for user in * ; do
   mkdir -p /vol/mail/${user}
   chown vmail:vmail /vol/mail/${user}