diff --git a/docker-compose.yml b/docker-compose.yml index e651ad6..d089ef4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - "3306:3306" volumes: - - ./mariadb:/etc/mysql/conf.d/ + - ./mariadb/master.cnf:/etc/mysql/conf.d/master.cnf ireddocker: diff --git a/ireddocker/.dockerinit.sh.swp b/ireddocker/.dockerinit.sh.swp new file mode 100644 index 0000000..c97a37f Binary files /dev/null and b/ireddocker/.dockerinit.sh.swp differ diff --git a/ireddocker/dockerinit.sh b/ireddocker/dockerinit.sh index 3af6c0c..7e23ae4 100644 --- a/ireddocker/dockerinit.sh +++ b/ireddocker/dockerinit.sh @@ -63,7 +63,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 - sleep 1 + sleep 5 done fi @@ -322,22 +322,13 @@ done 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;" /usr/bin/mysqldump --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ --host=$MYSQL_MASTER_ADDRESS $i > /tmp/$i.sql - mysql_bin_file=$(/usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ - --host=$MYSQL_MASTER_ADDRESS --execute="SHOW MASTER STATUS;" | grep $i | awk '{print $2}') - - 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 $i | awk '{print $4}') - - echo $mysql_position - /usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ --host=$MYSQL_MASTER_ADDRESS --execute="UNLOCK TABLES;" @@ -346,34 +337,47 @@ done /usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ --host=$MYSQL_SLAVE_ADDRESS $i < /tmp/$i.sql - - /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', \ - 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;" 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}') + + 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}') + + 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', \ +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;" - } +#Configure mysql replication + if [[ X"${LDAP_EXTERNAL_USE}" == X'YES' || X"${LDAP_EXTERNAL_USE}" == X'yes' ]]; then external_ldap_config fi if [[ X"${MYSQL_USE_REPLICATION}" == X'YES' || X"${MYSQL_USE_REPLICATION}" == X'yes' ]]; then + + while ! mysqladmin ping -h"${MYSQL_SLAVE_ADDRESS}" --silent; do + echo unable to connect to slave database! + sleep 5 + done + configure_mysql_replication fi - touch /.configured - # Replace certs @@ -386,6 +390,9 @@ done ln -s /opt/iredmail/ssl/$CUSTOM_CERT_CERTFILE /etc/ssl/certs/iRedMail.crt fi +# replace spamassasin config for sysvinit + +sed -i 's/ENABLED=0/ENABLED=1/g' /etc/default/spamassassin # Start syslog-ng @@ -417,15 +424,16 @@ done fi while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do - sleep 1 + sleep 5 done +touch /.configured else #does not start, if mysql stopped while ! mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do - sleep 1 + sleep 5 done if [[ X"${CUSTOM_CERT_USE}" == X'YES' || X"${CUSTOM_CERT_USE}" == X'yes' ]]; then @@ -467,7 +475,7 @@ else fi while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do - sleep 1 + sleep 5 done fi diff --git a/test.sh b/test.sh index 12764d3..c9f2ef0 100644 --- a/test.sh +++ b/test.sh @@ -1,8 +1,21 @@ #!/bin/bash + exec > >(tee -i /tmp/test.log) + + exec 2>&1 + bases="amavis iredadmin iredapd roundcubemail" -for i in $bases; do - echo some users param with "very interesting string '$i' and other" -done +MYSQL_ROOT_USER=root +MYSQL_ROOT_PASSWD=123qweASD +MYSQL_MASTER_ADDRESS=172.17.5.31 +MYSQL_SLAVE_USER_PASSWD=123qweASD + +/usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ +--host=$MYSQL_MASTER_ADDRESS \ +--execute="GRANT REPLICATION SLAVE ON *.* TO 'slave_user'@'%'\ +IDENTIFIED BY $MYSQL_SLAVE_USER_PASSWD; FLUSH PRIVILEGES;" + +/usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ + --host=$MYSQL_MASTER_ADDRESS --execute="SHOW DATABASES;"