Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
chaosbunker 2017-04-18 20:56:35 +02:00
parent 7273fcaafc
commit a3bbd76537
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/misc/mailcow-setup-relayhost.sh
View File

@ -8,8 +8,10 @@ if [ "$EUID" -ne 0 ]
exit 1 exit 1
fi fi
# move into mailcow-dockerized base directory # Find script directory and move to base directory of mailcow-dockerized
cd ../../ # so docker-compose is executed from the right location
DIR=$(echo $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) | sed 's/mailcow-dockerized.*/mailcow-dockerized/')
cd $DIR
if [[ ${1} == "reset" ]]; then if [[ ${1} == "reset" ]]; then
# Reset modified values to their defaults # Reset modified values to their defaults
@ -62,7 +64,7 @@ else
sed -i "s/relayhost\ \=.*/relayhost\ \=\ \[${1}\]\:${2}/" data/conf/postfix/main.cf sed -i "s/relayhost\ \=.*/relayhost\ \=\ \[${1}\]\:${2}/" data/conf/postfix/main.cf
if grep -q "smtp_sasl_password_maps" data/conf/postfix/main.cf if grep -q "smtp_sasl_password_maps" data/conf/postfix/main.cf
then then
sed -i "s/^smtp\_sasl\_password\_maps.*/smtp_sasl\_password\_maps\ \=\ hash\:\/opt\/postfix\/conf\/smarthost\_passwd/" data/conf/postfix/main.cf sed -i "s/^smtp\_sasl\_password\_maps.*/smtp\_sasl\_password\_maps\ \=\ hash\:\/opt\/postfix\/conf\/smarthost\_passwd/" data/conf/postfix/main.cf
else else
echo "smtp_sasl_password_maps = hash:/opt/postfix/conf/smarthost_passwd" >> data/conf/postfix/main.cf echo "smtp_sasl_password_maps = hash:/opt/postfix/conf/smarthost_passwd" >> data/conf/postfix/main.cf
fi fi
@ -72,10 +74,12 @@ else
else else
echo "smtp_sasl_auth_enable = yes" >> data/conf/postfix/main.cf echo "smtp_sasl_auth_enable = yes" >> data/conf/postfix/main.cf
fi fi
docker-compose exec postfix-mailcow postconf -e "smtp_sasl_password_maps = hash:/opt/postfix/conf/smarthost_passwd" if grep -q "smtp_sasl_security_options" data/conf/postfix/main.cf
# We can use anonymous and plain-text authentication, too (be warned) then
docker-compose exec postfix-mailcow postconf -e "smtp_sasl_security_options = " sed -i "s/^smtp\_sasl\_security\_options.*/smtp\_sasl\_security\_options\ \=/" data/conf/postfix/main.cf
docker-compose exec postfix-mailcow postconf -e "smtp_sasl_auth_enable = yes" else
echo "smtp_sasl_security_options =" >> data/conf/postfix/main.cf
fi
if [[ ! -z ${3} ]]; then if [[ ! -z ${3} ]]; then
echo ${1} ${3}:${4} > data/conf/postfix/smarthost_passwd echo ${1} ${3}:${4} > data/conf/postfix/smarthost_passwd
docker-compose exec postfix-mailcow postmap /opt/postfix/conf/smarthost_passwd docker-compose exec postfix-mailcow postmap /opt/postfix/conf/smarthost_passwd