[Postfix] Fix sasl_passwd query from alias domain, fixes #2410
[Web] Major fix, added a line break! [Compose] Update Postfix imagemaster
parent
2443e956eb
commit
15970ab8dc
|
@ -104,13 +104,12 @@ query = SELECT CONCAT_WS(':', username, password) AS auth_data FROM relayhosts
|
||||||
WHERE id IN (
|
WHERE id IN (
|
||||||
SELECT relayhost FROM domain
|
SELECT relayhost FROM domain
|
||||||
WHERE CONCAT('@', domain) = '%s'
|
WHERE CONCAT('@', domain) = '%s'
|
||||||
OR '%s' IN (
|
OR domain IN (
|
||||||
SELECT CONCAT('@', alias_domain) FROM alias_domain
|
SELECT target_domain FROM alias_domain WHERE CONCAT('@', alias_domain) = '%s'
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
AND active = '1'
|
AND active = '1'
|
||||||
AND username != '';
|
AND username != '';
|
||||||
EOF
|
|
||||||
|
|
||||||
cat <<EOF > /opt/postfix/conf/sql/mysql_sasl_passwd_maps_transport_maps.cf
|
cat <<EOF > /opt/postfix/conf/sql/mysql_sasl_passwd_maps_transport_maps.cf
|
||||||
user = ${DBUSER}
|
user = ${DBUSER}
|
||||||
|
|
|
@ -746,6 +746,7 @@ $tfa_data = get_tfa();
|
||||||
<div id="active_settings_map" class="collapse" >
|
<div id="active_settings_map" class="collapse" >
|
||||||
<textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code" rows="20" name="settings_map" readonly><?=file_get_contents('http://nginx:8081/settings.php');?></textarea>
|
<textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code" rows="20" name="settings_map" readonly><?=file_get_contents('http://nginx:8081/settings.php');?></textarea>
|
||||||
</div>
|
</div>
|
||||||
|
<br>
|
||||||
<?php $rsettings = rsettings('get'); ?>
|
<?php $rsettings = rsettings('get'); ?>
|
||||||
<form class="form" data-id="rsettings" role="form" method="post">
|
<form class="form" data-id="rsettings" role="form" method="post">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
|
@ -211,7 +211,7 @@ services:
|
||||||
- dovecot
|
- dovecot
|
||||||
|
|
||||||
postfix-mailcow:
|
postfix-mailcow:
|
||||||
image: mailcow/postfix:1.29
|
image: mailcow/postfix:1.30
|
||||||
build: ./data/Dockerfiles/postfix
|
build: ./data/Dockerfiles/postfix
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/conf/postfix:/opt/postfix/conf
|
- ./data/conf/postfix:/opt/postfix/conf
|
||||||
|
|
Loading…
Reference in New Issue