diff --git a/README.md b/README.md index 0b4fd32..77f7ab6 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ MYSQL_MASTER_ADDRESS=#address of master server in case of replication MYSQL_SLAVE_ADDRESS=#address of slsve server in case of replication MYSQL_DATABASES="amavis iredadmin iredapd roundcubemail" MYSQL_USE_REPLICTION=YES -MYSQLEXIST=#usage existing databse +MYSQL_EXTERNAL=YES#usage existing databse MYSQL_ROOT_USER=#name for admin(root) user of external database MYSQL_ROOT_PASSWD=#passwd for admin(root) user of external database CUSTOM_CERT_USE:=NO#usage of external cert file. If Yes - place certfile in cert_dir directory, in global catalog diff --git a/ireddocker/dockerinit.sh b/ireddocker/dockerinit.sh index 749e13f..3af6c0c 100644 --- a/ireddocker/dockerinit.sh +++ b/ireddocker/dockerinit.sh @@ -16,9 +16,9 @@ if [[ ! -f ".configured" ]]; then : ${MYSQL_SLAVE_USER_PASSWD:=`eval /dev/null || head -c 20)`} : ${MYSQL_ROOT_PASSWD:=admin_password} : ${MYSQL_GRANT_HOST:=%} -: ${MYSQL_DATABASES:="amavis iredadmin iredapd roundcubemail"} -: ${MYSQL_USE_REPLICTION:=NO} -: ${MYSQLEXIST:=NO} +: ${MYSQL_DATABASES:=amavis iredadmin iredapd roundcubemail} +: ${MYSQL_USE_REPLICATION:=NO} +: ${MYSQL_EXTERNAL:=NO} : ${CUSTOM_CERT_USE:=NO} : ${CUSTOM_CERT_KEYFILE:=privkey.pem} : ${CUSTOM_CERT_CERTFILE:=fullchain.pem} @@ -56,12 +56,12 @@ if [[ ! -f ".configured" ]]; then : ${USE_SYSTEMD:=NO} : ${MAILNAME:=`hostname -f`} - if [[ X"${MYSQLEXIST}" == X'YES' || X"${MYSQLEXIST}" == X'yes' ]]; then + if [[ X"${MYSQL_EXTERNAL}" == X'YES' || X"${MYSQL_EXTERNAL}" == X'yes' ]]; then : ${USE_EXISTING_MYSQL:=YES} fi - if [[ X"${MYSQLEXIST}" == X'YES' || X"${MYSQLEXIST}" == X'yes' ]]; then + if [[ X"${MYSQL_EXTERNAL}" == X'YES' || X"${MYSQL_EXTERNAL}" == X'yes' ]]; then while ! mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do sleep 1 done @@ -105,14 +105,16 @@ export FAIL2BAN_DB_PASSWD='$SOGO_DB_PASSWD' #EOF EOF +# Create syslog user +useradd -U --home-dir /home/syslog --groups adm -s /usr/sbin/nologin syslog echo '> install iredmail' # Install iredmail - if [[ X"${MYSQLEXIST}" == X'YES' || X"${MYSQLEXIST}" == X'yes' ]]; then + if [[ X"${MYSQL_EXTERNAL}" == X'YES' || X"${MYSQL_EXTERNAL}" == X'yes' ]]; then USE_EXISTING_MYSQL=YES MYSQL_SERVER_ADDRESS=$MYSQL_SERVER_ADDRESS \ MYSQL_SERVER_PORT=$MYSQL_SERVER_PORT MYSQL_ROOT_USER=$MYSQL_ROOT_USER \ MYSQL_ROOT_PASSWD=$MYSQL_ROOT_PASSWD MYSQL_GRANT_HOST=$MYSQL_GRANT_HOST \ @@ -309,6 +311,11 @@ EOF configure_mysql_replication() { +for i in $MYSQL_DATABASES; do + echo $i +done + + /usr/bin/mysql --user=$MYSQL_ROOT_USER --password=$MYSQL_ROOT_PASSWD \ --host=$MYSQL_MASTER_ADDRESS \ --execute="GRANT REPLICATION SLAVE ON *.* TO 'slave_user'@'%'\ @@ -319,14 +326,18 @@ configure_mysql_replication() { --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/$MYSQL_DATABASES.sql + --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;" @@ -381,7 +392,7 @@ configure_mysql_replication() { /usr/sbin/syslog-ng -F --no-caps & - if [[ X"${MYSQLEXIST}" != X'YES' || X"${MYSQLEXIST}" != X'yes' ]]; then + if [[ X"${MYSQL_EXTERNAL}" != X'YES' || X"${MYSQL_EXTERNAL}" != X'yes' ]]; then service mysql restart fi @@ -432,7 +443,7 @@ else /usr/sbin/syslog-ng -F --no-caps & - if [[ X"${MYSQLEXIST}" != X'YES' || X"${MYSQLEXIST}" != X'yes' ]]; then + if [[ X"${MYSQL_EXTERNAL}" != X'YES' || X"${MYSQL_EXTERNAL}" != X'yes' ]]; then service mysql start fi