Skip to content
This repository has been archived by the owner on Nov 29, 2020. It is now read-only.

Commit

Permalink
Merge pull request #70 from sofuture/patch-1
Browse files Browse the repository at this point in the history
fix typos
  • Loading branch information
Feng Honglin committed Jul 4, 2015
2 parents b2b6f72 + 034af6a commit d5269f2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions 5.5/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ if [ -n "${REPLICATION_SLAVE}" ]; then
sed -i "s/^#log-bin.*/log-bin = mysql-bin/" ${CONF_FILE}
touch /replication_set.1
else
echo "=> MySQL replicaiton slave already configured, skip"
echo "=> MySQL replication slave already configured, skip"
fi
else
echo "=> Cannot configure slave, please link it to another MySQL container with alias as 'mysql'"
Expand Down Expand Up @@ -139,7 +139,7 @@ if [ -n "${STARTUP_SQL}" ]; then
fi

# Set MySQL REPLICATION - MASTER
if [ -n "${REPLICATION_MASTER}" ]; then
if [ -n "${REPLICATION_MASTER}" ]; then
echo "=> Configuring MySQL replication as master (2/2) ..."
if [ ! -f /replication_set.2 ]; then
echo "=> Creating a log user ${REPLICATION_USER}:${REPLICATION_PASS}"
Expand All @@ -154,7 +154,7 @@ if [ -n "${REPLICATION_MASTER}" ]; then
fi

# Set MySQL REPLICATION - SLAVE
if [ -n "${REPLICATION_SLAVE}" ]; then
if [ -n "${REPLICATION_SLAVE}" ]; then
echo "=> Configuring MySQL replication as slave (2/2) ..."
if [ -n "${MYSQL_PORT_3306_TCP_ADDR}" ] && [ -n "${MYSQL_PORT_3306_TCP_PORT}" ]; then
if [ ! -f /replication_set.2 ]; then
Expand All @@ -164,7 +164,7 @@ if [ -n "${REPLICATION_SLAVE}" ]; then
echo "=> Done!"
touch /replication_set.2
else
echo "=> MySQL replicaiton slave already configured, skip"
echo "=> MySQL replication slave already configured, skip"
fi
else
echo "=> Cannot configure slave, please link it to another MySQL container with alias as 'mysql'"
Expand Down
8 changes: 4 additions & 4 deletions 5.6/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ if [ -n "${REPLICATION_SLAVE}" ]; then
sed -i "s/^#log-bin.*/log-bin = mysql-bin/" ${CONF_FILE}
touch /replication_set.1
else
echo "=> MySQL replicaiton slave already configured, skip"
echo "=> MySQL replication slave already configured, skip"
fi
else
echo "=> Cannot configure slave, please link it to another MySQL container with alias as 'mysql'"
Expand Down Expand Up @@ -139,7 +139,7 @@ if [ -n "${STARTUP_SQL}" ]; then
fi

# Set MySQL REPLICATION - MASTER
if [ -n "${REPLICATION_MASTER}" ]; then
if [ -n "${REPLICATION_MASTER}" ]; then
echo "=> Configuring MySQL replication as master (2/2) ..."
if [ ! -f /replication_set.2 ]; then
echo "=> Creating a log user ${REPLICATION_USER}:${REPLICATION_PASS}"
Expand All @@ -154,7 +154,7 @@ if [ -n "${REPLICATION_MASTER}" ]; then
fi

# Set MySQL REPLICATION - SLAVE
if [ -n "${REPLICATION_SLAVE}" ]; then
if [ -n "${REPLICATION_SLAVE}" ]; then
echo "=> Configuring MySQL replication as slave (2/2) ..."
if [ -n "${MYSQL_PORT_3306_TCP_ADDR}" ] && [ -n "${MYSQL_PORT_3306_TCP_PORT}" ]; then
if [ ! -f /replication_set.2 ]; then
Expand All @@ -164,7 +164,7 @@ if [ -n "${REPLICATION_SLAVE}" ]; then
echo "=> Done!"
touch /replication_set.2
else
echo "=> MySQL replicaiton slave already configured, skip"
echo "=> MySQL replication slave already configured, skip"
fi
else
echo "=> Cannot configure slave, please link it to another MySQL container with alias as 'mysql'"
Expand Down

0 comments on commit d5269f2

Please sign in to comment.