deuill/coreos-home-server
1
0
Fork 0
mirror of https://github.com/deuill/coreos-home-server.git synced 2024-09-21 05:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

postfix: Correct use of invalid POSTFIX_ env

Browse Source 
These were likely due to copy-paste misses, and cause issues with
connecting to the underlying mail database.
This commit is contained in:
Alex Palaistras 2021-03-21 00:18:36 +00:00
parent 4309b3d093
commit 65e15b036e
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
config/service/postfix/container/config/master.cf.template → config/service/postfix/container/config/master.cf
View File

8
config/service/postfix/container/config/mysql-alias.cf.template
View File

@ -1,7 +1,7 @@
hosts = ${PROSODY_DATABASE_HOST}
user = ${PROSODY_DATABASE_USERNAME}
password = ${PROSODY_DATABASE_PASSWORD}
dbname = ${PROSODY_DATABASE_NAME}
hosts = ${POSTFIX_DATABASE_HOST}
user = ${POSTFIX_DATABASE_USERNAME}
password = ${POSTFIX_DATABASE_PASSWORD}
dbname = ${POSTFIX_DATABASE_NAME}
table = aliases
select_field = destination
where_field = mail

8
config/service/postfix/container/config/mysql-domains.cf.template
View File

@ -1,7 +1,7 @@
hosts = ${PROSODY_DATABASE_HOST}
user = ${PROSODY_DATABASE_USERNAME}
password = ${PROSODY_DATABASE_PASSWORD}
dbname = ${PROSODY_DATABASE_NAME}
hosts = ${POSTFIX_DATABASE_HOST}
user = ${POSTFIX_DATABASE_USERNAME}
password = ${POSTFIX_DATABASE_PASSWORD}
dbname = ${POSTFIX_DATABASE_NAME}
table = domains
select_field = domain
where_field = domain

8
config/service/postfix/container/config/mysql-mailbox.cf.template
View File

@ -1,7 +1,7 @@
hosts = ${PROSODY_DATABASE_HOST}
user = ${PROSODY_DATABASE_USERNAME}
password = ${PROSODY_DATABASE_PASSWORD}
dbname = ${PROSODY_DATABASE_NAME}
hosts = ${POSTFIX_DATABASE_HOST}
user = ${POSTFIX_DATABASE_USERNAME}
password = ${POSTFIX_DATABASE_PASSWORD}
dbname = ${POSTFIX_DATABASE_NAME}
table = users
select_field = maildir
where_field = username

6
config/service/postfix/postfix.env.template
View File

@ -4,6 +4,12 @@ POSTFIX_MAIL_SASL_PATH=inet:dovecot:3659
POSTFIX_MAIL_MILTER_PATH=inet:rspamd:11332
POSTFIX_MAIL_TRANSPORT_PATH=lmtp:inet:dovecot:24
# Database options.
POSTFIX_DATABASE_HOST=mariadb
POSTFIX_DATABASE_NAME=${DOVECOT_DATABASE_NAME}
POSTFIX_DATABASE_USERNAME=${DOVECOT_DATABASE_USERNAME}
POSTFIX_DATABASE_PASSWORD=${DOVECOT_DATABASE_PASSWORD}
# Service user options.
POSTFIX_LOCAL_SMTP_USERNAME=${POSTFIX_LOCAL_SMTP_USERNAME}
POSTFIX_LOCAL_SMTP_PASSWORD=${POSTFIX_LOCAL_SMTP_PASSWORD}

1
config/service/postfix/postfix.service
View File

@ -7,7 +7,6 @@ After=container-build@%N.service container-network@mail.service container-networ
Restart=always
ExecStartPre=/bin/install --owner 5000 --group 5000 -d /var/lib/container-service/mail
ExecStartPre=/bin/podman create --replace --pull never --net internal,mail --env-file /etc/container-service/%N/%N.env \
--env-file /etc/container-service/dovecot/dovecot.env \
--publish 25:25 --publish 465:465 --publish 587:587 \
--volume /var/lib/container-service/mail:/var/mail:z \
--volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \