diff --git a/README.md b/README.md index 8abee61..3fd5022 100644 --- a/README.md +++ b/README.md @@ -33,47 +33,53 @@ EOF ... and run container from this directory: -```docker run --name slave-mariadb -v ./slave.cnf:/etc/mysql/conf.d/slave.cnf -e MYSQL_ROOT_PASSWORD=(the sama password as in master server) -d -p 3306:3306 mariadb:latest``` +```docker run --name slave-mariadb -v ./slave.cnf:/etc/mysql/conf.d/slave.cnf -e MYSQL_ROOT_PASSWORD=(the sama password as in master server) -d -p :3306 mariadb:latest``` + +In most cases public port you need is set to 3306 too, but if you need to change this, set custom port in filed ``````, and set this in ```envfiles/iredmail-env.conf``` in field ```MYSQL_SLAVE_PORT=``` ### Config on master server -1. add FQDN name in ```docker-compose.yml``` file +1. add FQDN name in ```docker-compose.yml``` file(in filed ```hostname```), and set non default mariadb port too. 1. create file ```envfiles/iredmail-env.conf``` for iredmail, like this: ``` cat < envfiles/iredmail-env.conf -#USE OR NOT EXTERNAL DATABASE +#USE OR NOT EXTERNAL DATABASE. Default: NO LDAP_EXTERNAL_USE=YES -#ldap server address +#ldap server address. Default: 127.0.0.1 LDAP_EXTERNAL_SERVER= -#bind password for ldap +#bind password for ldap. Default: random LDAP_EXTERNAL_BINDPW= -#bind user for ldap +#bind user for ldap Default: vmail LDAP_EXTERNAL_BINDUSER= -#base dn for mail users +#base dn for mail users. Default cn=users,dc=example,dc=com LDAP_EXTERNAL_BASE= -#mail domain name +#mail domain name. Default: example.com FIRST_DOMAIN= -#address of master server in case of replication +#usage existing databse. Default: NO +MYSQL_EXTERNAL= +#USE OR NOT EXTERNAL DATABASE REPLICATION. Default: NO +MYSQL_USE_REPLICTION= +#address of master server in case of replication. Default 127.0.0.1 MYSQL_MASTER_ADDRESS= -#address of slave server in case of replication +#port of master server in case of replication. Default: 3306 +MYSQL_MASTER_PORT= +#address of slave server in case of replication. Default: 127.0.0.1 MYSQL_SLAVE_ADDRESS= -#MYSQL DATABASES FOR REPLICATION +#port of slave server in case of replication. Default: 3306 +MYSQL_SLAVE_PORT= +#MYSQL DATABASES FOR REPLICATION. Default: amavis iredadmin iredapd roundcubemail MYSQL_DATABASES=amavis iredadmin iredapd roundcubemail -#usage existing databse -MYSQL_EXTERNAL=YES -#USE OR NOT EXTERNAL DATABASE REPLICATION -MYSQL_USE_REPLICTION=YES -#name for admin(root) user of external database +#name for admin(root) user of external database. Default: root MYSQL_ROOT_USER= -#passwd for admin(root) user of external database +#passwd for admin(root) user of external database. Default: random MYSQL_ROOT_PASSWD= -#usage of external cert file. If Yes - place certfile in cert_dir directory, in global catalog -CUSTOM_CERT_USE=NO -#Name of external key file -CUSTOM_CERT_KEYFILE=privkey.pem -#Name of external cert file -CUSTOM_CERT_CERTFILE=fullchain.pem +#usage of external cert file. If Yes - place certfile in cert_dir directory, in global catalog. Default: NO +CUSTOM_CERT_USE= +#Name of external key file. Default: preivkey.pem +CUSTOM_CERT_KEYFILE= +#Name of external cert file. Default: fullchain.pem +CUSTOM_CERT_CERTFILE= EOF ``` 1. create file ```envfiles/mariadb-env.conf``` for mariadb, like this: diff --git a/docker-compose.yml b/docker-compose.yml index c66fe3a..e0f8153 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: env_file: - envfiles/mariadb-env.conf ports: - - "3306:3306" + - "3307:3306" volumes: - ./mariadb/master.cnf:/etc/mysql/conf.d/master.cnf diff --git a/ireddocker/docker-entrypoint.sh b/ireddocker/docker-entrypoint.sh index b6d9ebb..ae9017c 100644 --- a/ireddocker/docker-entrypoint.sh +++ b/ireddocker/docker-entrypoint.sh @@ -9,9 +9,11 @@ if [[ ! -f ".configured" ]]; then set -x : ${MYSQL_MASTER_ADDRESS:=127.0.0.1} +: ${MYSQL_MASTER_PORT:=3306} +: ${MYSQL_SLAVE_PORT:=3306} : ${MYSQL_SLAVE_ADDRESS:=127.0.0.1} : ${MYSQL_SERVER_ADDRESS:=$MYSQL_MASTER_ADDRESS} -: ${MYSQL_SERVER_PORT:=3306} +: ${MYSQL_SERVER_PORT:=$MYSQL_MASTER_PORT} : ${MYSQL_ROOT_USER:=admin_iredmail} : ${MYSQL_SLAVE_USER_PASSWD:=`eval /dev/null || head -c 20)`} : ${MYSQL_ROOT_PASSWD:=admin_password} @@ -62,7 +64,7 @@ if [[ ! -f ".configured" ]]; then if [[ X"${MYSQL_EXTERNAL}" == X'YES' || X"${MYSQL_EXTERNAL}" == X'yes' ]]; then - while ! mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do + while ! mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" -P"${MYSQL_SERVER_PORT}" --silent; do sleep 5 done fi @@ -123,6 +125,7 @@ useradd -U --home-dir /home/syslog --groups adm -s /usr/sbin/nologin syslog AUTO_CLEANUP_REMOVE_SENDMAIL=y AUTO_CLEANUP_REPLACE_MYSQL_CONFIG=y \ bash /iredmail/iRedMail.sh echo $MYSQL_SERVER_ADDRESS + echo $MYSQL_SERVER_PORT echo $MYSQL_GRANT_HOST else AUTO_USE_EXISTING_CONFIG_FILE=y AUTO_INSTALL_WITHOUT_CONFIRM=y \ @@ -312,6 +315,7 @@ EOF configure_mysql_replication() { +#Configuration of mysql master-slave replication for i in $MYSQL_DATABASES; do echo $i @@ -319,50 +323,50 @@ done /usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ - --host=$MYSQL_MASTER_ADDRESS \ + --host=$MYSQL_MASTER_ADDRESS --port=$MYSQL_MASTER_PORT \ --execute="GRANT REPLICATION SLAVE ON *.* TO 'slave_user'@'%'\ IDENTIFIED BY '$MYSQL_SLAVE_USER_PASSWD'; FLUSH PRIVILEGES;" for i in $MYSQL_DATABASES; do /usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ - --host=$MYSQL_MASTER_ADDRESS --execute="USE $i; FLUSH TABLES WITH READ LOCK;" + --host=$MYSQL_MASTER_ADDRESS --port=$MYSQL_MASTER_PORT \ + --execute="USE $i; FLUSH TABLES WITH READ LOCK;" /usr/bin/mysqldump --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ - --host=$MYSQL_MASTER_ADDRESS $i > /tmp/$i.sql + --host=$MYSQL_MASTER_ADDRESS --port=$MYSQL_MASTER_PORT $i > /tmp/$i.sql /usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ - --host=$MYSQL_MASTER_ADDRESS --execute="UNLOCK TABLES;" + --host=$MYSQL_MASTER_ADDRESS --port=$MYSQL_MASTER_PORT --execute="UNLOCK TABLES;" /usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ - --host=$MYSQL_SLAVE_ADDRESS --execute="CREATE DATABASE $i;" + --host=$MYSQL_SLAVE_ADDRESS --port=$MYSQL_SLAVE_PORT --execute="CREATE DATABASE $i;" /usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ - --host=$MYSQL_SLAVE_ADDRESS $i < /tmp/$i.sql + --host=$MYSQL_SLAVE_ADDRESS --port=$MYSQL_SLAVE_PORT $i < /tmp/$i.sql done mysql_bin_file=$(/usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ ---host=$MYSQL_MASTER_ADDRESS --execute="SHOW MASTER STATUS;" | grep mysql-bin | awk '{print $1}') +--host=$MYSQL_MASTER_ADDRESS --port=$MYSQL_MASTER_PORT --execute="SHOW MASTER STATUS;" | grep mysql-bin | awk '{print $1}') echo $mysql_bin_file mysql_position=$(/usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ ---host=$MYSQL_MASTER_ADDRESS --execute="SHOW MASTER STATUS;" | grep mysql-bin | awk '{print $2}') +--host=$MYSQL_MASTER_ADDRESS --port=$MYSQL_MASTER_PORT --execute="SHOW MASTER STATUS;" | grep mysql-bin | awk '{print $2}') echo $mysql_position /usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ ---host=$MYSQL_SLAVE_ADDRESS --execute="CHANGE MASTER TO MASTER_HOST='$MYSQL_MASTER_ADDRESS', \ -MASTER_USER='slave_user', MASTER_PASSWORD='$MYSQL_SLAVE_USER_PASSWD', \ +--host=$MYSQL_SLAVE_ADDRESS --port=$MYSQL_SLAVE_PORT --execute="CHANGE MASTER TO MASTER_HOST='$MYSQL_MASTER_ADDRESS', \ +MASTER_PORT='$MYSQL_MASTER_PORT', MASTER_USER='slave_user', MASTER_PASSWORD='$MYSQL_SLAVE_USER_PASSWD', \ MASTER_LOG_FILE = '$mysql_bin_file', MASTER_LOG_POS = $mysql_position;" /usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ ---host=$MYSQL_SLAVE_ADDRESS --execute="START SLAVE;" +--host=$MYSQL_SLAVE_ADDRESS --port=$MYSQL_SLAVE_PORT --execute="START SLAVE;" } -#Configure mysql replication if [[ X"${LDAP_EXTERNAL_USE}" == X'YES' || X"${LDAP_EXTERNAL_USE}" == X'yes' ]]; then @@ -371,7 +375,7 @@ MASTER_LOG_FILE = '$mysql_bin_file', MASTER_LOG_POS = $mysql_position;" if [[ X"${MYSQL_USE_REPLICATION}" == X'YES' || X"${MYSQL_USE_REPLICATION}" == X'yes' ]]; then - while ! mysqladmin ping -h"${MYSQL_SLAVE_ADDRESS}" --silent; do + while ! mysqladmin ping -h"${MYSQL_SLAVE_ADDRESS}" -P"${MYSQL_SERVER_PORT}" --silent; do echo unable to connect to slave database! sleep 5 done @@ -425,7 +429,7 @@ sed -i 's/ENABLED=0/ENABLED=1/g' /etc/default/spamassassin /usr/bin/python3 /opt/iredapd/iredapd.py & fi - while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do + while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" -P"${MYSQL_SERVER_PORT}" --silent; do sleep 5 done @@ -434,7 +438,7 @@ touch /.configured else #does not start, if mysql stopped - while ! mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do + while ! mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" -P"${MYSQL_SERVER_PORT}" --silent; do sleep 5 done @@ -476,7 +480,7 @@ else /usr/bin/python3 /opt/iredapd/iredapd.py & fi - while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do + while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" -P"${MYSQL_SERVER_PORT}" --silent; do sleep 5 done diff --git a/ireddocker/iredmail/functions/packages.sh b/ireddocker/iredmail/functions/packages.sh index 41d5365..edac50e 100644 --- a/ireddocker/iredmail/functions/packages.sh +++ b/ireddocker/iredmail/functions/packages.sh @@ -778,7 +778,7 @@ EOF # Do not run them with 'check_status_before_run', so that we can always # install missed packages and enable/disable new services while re-run # iRedMail installer. - install_all_pkgs +# install_all_pkgs enable_all_services check_status_before_run after_package_installation