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

fix typos #70

Merged
tifayuki merged 1 commit into from
Jul 4, 2015
Merged

fix typos #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions 5.5/run.sh
View file
Open in desktop
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
View file
Open in desktop
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