Some changes

master
andryyy 2016-12-12 09:26:27 +01:00
parent 2135f17de5
commit 57ca2b9f55
4 changed files with 8 additions and 8 deletions

View File

@ -1,10 +1,14 @@
#!/bin/bash #!/bin/bash
/bin/bash port-check.sh
[[ $? != 0 ]] && exit 1
/bin/bash build-network.sh /bin/bash build-network.sh
/bin/bash build-pdns.sh /bin/bash build-pdns.sh
[[ $? != 0 ]] && exit 1 [[ $? != 0 ]] && exit 1
for buildx in $(ls build-*.sh | grep -vE "all|network|pdns"); do for buildx in $(ls build-*.sh | grep -vE "all|network|pdns"); do
echo "Starting build file ${buildx} ..." echo "Starting build file ${buildx} ..."
/bin/bash ${buildx} /bin/bash ${buildx}
done done
/bin/bash fix-permissions.sh /bin/bash fix-permissions.sh

View File

@ -36,15 +36,10 @@ else
build build
fi fi
sed -i "/myhostname/c\myhostname=${MAILCOW_HOSTNAME}" data/conf/postfix/main.cf
sed -i "/^user/c\user = ${DBUSER}" data/conf/postfix/sql/* sed -i "/^user/c\user = ${DBUSER}" data/conf/postfix/sql/*
sed -i "/^password/c\password = ${DBPASS}" data/conf/postfix/sql/* sed -i "/^password/c\password = ${DBPASS}" data/conf/postfix/sql/*
sed -i "/^dbname/c\dbname = ${DBNAME}" data/conf/postfix/sql/* sed -i "/^dbname/c\dbname = ${DBNAME}" data/conf/postfix/sql/*
if [[ -z $(cat data/conf/postfix/main.cf | grep ${DOCKER_SUBNET}) ]]; then
sed -i -e "s_^mynetworks.*_& ${DOCKER_SUBNET}_" data/conf/postfix/main.cf
fi
docker run \ docker run \
-p ${SMTP_PORT}:25 \ -p ${SMTP_PORT}:25 \
-p ${SMTPS_PORT}:465 \ -p ${SMTPS_PORT}:465 \

View File

@ -7,6 +7,7 @@ NAME="mariadb-mailcow"
reconf() { reconf() {
echo "Installing database schema (this will not overwrite existing data)" echo "Installing database schema (this will not overwrite existing data)"
echo "It may take a while for MariaDB to warm up, please wait..." echo "It may take a while for MariaDB to warm up, please wait..."
echo docker exec ${NAME} mysql -u${DBUSER} -p${DBPASS} ${DBNAME}
until docker exec ${NAME} /bin/bash -c "mysql -u'${DBUSER}' -p'${DBPASS}' ${DBNAME} < /assets/init.sql"; do until docker exec ${NAME} /bin/bash -c "mysql -u'${DBUSER}' -p'${DBPASS}' ${DBNAME} < /assets/init.sql"; do
echo "Trying again in 2 seconds..." echo "Trying again in 2 seconds..."
sleep 2 sleep 2

View File

@ -3,13 +3,13 @@
# Default admin user is "admin" # Default admin user is "admin"
# Default password is "moohoo" # Default password is "moohoo"
MAILCOW_HOSTNAME=logs.servercow.de MAILCOW_HOSTNAME=mail.example.org
# SQL database configuration # SQL database configuration
DBNAME=mailcow DBNAME=mailcow
DBUSER=mailcow DBUSER=mailcow
DBPASS=mysafepasswd DBPASS=mysafepasswd
DBROOT=myverysafepasswd DBROOT=myothersafepasswd
# MariaDB # MariaDB
DBVERS=latest DBVERS=latest
@ -25,7 +25,7 @@ NGINXVERS="stable"
# You should leave that alone # You should leave that alone
# Can also be 11.22.33.44:25 or 0.0.0.0:465 etc. for specific binding # Can also be 11.22.33.44:25 or 0.0.0.0:465 etc. for specific binding
SMTP_PORT=26 SMTP_PORT=25
SMTPS_PORT=465 SMTPS_PORT=465
SUBMISSION_PORT=587 SUBMISSION_PORT=587
IMAP_PORT=143 IMAP_PORT=143