Skip to content

Commit 9bb1b8d

Browse files
committed
Fix tabs in proxysql entrypoint
1 parent f7f53f0 commit 9bb1b8d

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

proxysql/dockerdir/entrypoint.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ PROXY_SCHEDULER_CFG=/etc/proxysql-admin.cnf
1212
if [ -n ${PROXYSQL_SERVICE} ]; then
1313
MYSQL_INTERFACES='0.0.0.0:3306;0.0.0.0:33062'
1414
CLUSTER_PORT='33062'
15-
# Percona scheduler
16-
sed "s/^writerIsAlsoReader.*=.*$/writerIsAlsoReader = 1/" ${PERCONA_SCHEDULER_CFG} | \
17-
sed "s/^hgW.*=.*$/hgW = 11/" | \
18-
sed "s/^hgR.*=.*$/hgR = 10/" | \
19-
sed "s/^clustered.*=.*false$/clustered = true/" > ${TEMP_PROXY_SCHEDULER_CFG}
20-
cp -f ${TEMP_PROXY_SCHEDULER_CFG} ${PERCONA_SCHEDULER_CFG}
21-
# proxysql-admin scheduler
22-
sed "s/#export WRITERS_ARE_READERS=.*$/export WRITERS_ARE_READERS='yes'/g" ${PROXY_SCHEDULER_CFG} 1<> ${PROXY_SCHEDULER_CFG}
15+
# Percona scheduler
16+
sed "s/^writerIsAlsoReader.*=.*$/writerIsAlsoReader = 1/" ${PERCONA_SCHEDULER_CFG} | \
17+
sed "s/^hgW.*=.*$/hgW = 11/" | \
18+
sed "s/^hgR.*=.*$/hgR = 10/" | \
19+
sed "s/^clustered.*=.*false$/clustered = true/" > ${TEMP_PROXY_SCHEDULER_CFG}
20+
cp -f ${TEMP_PROXY_SCHEDULER_CFG} ${PERCONA_SCHEDULER_CFG}
21+
# proxysql-admin scheduler
22+
sed "s/#export WRITERS_ARE_READERS=.*$/export WRITERS_ARE_READERS='yes'/g" ${PROXY_SCHEDULER_CFG} 1<> ${PROXY_SCHEDULER_CFG}
2323
fi
2424

2525
sed "s/interfaces=\"0.0.0.0:3306\"/interfaces=\"${MYSQL_INTERFACES:-0.0.0.0:3306}\"/g" ${PROXY_CFG} 1<> ${PROXY_CFG}
@@ -64,14 +64,14 @@ fi
6464
SSL_DIR=${SSL_DIR:-/etc/proxysql/ssl}
6565
if [ -f "${SSL_DIR}/ca.crt" ]; then
6666
CA=${SSL_DIR}/ca.crt
67-
sed "s:^sslCertificatePath.*= .*\"$:sslCertificatePath = \"${SSL_DIR}\":" ${PERCONA_SCHEDULER_CFG} > ${TEMP_PROXY_SCHEDULER_CFG}
68-
cp -f ${TEMP_PROXY_SCHEDULER_CFG} ${PERCONA_SCHEDULER_CFG}
67+
sed "s:^sslCertificatePath.*= .*\"$:sslCertificatePath = \"${SSL_DIR}\":" ${PERCONA_SCHEDULER_CFG} > ${TEMP_PROXY_SCHEDULER_CFG}
68+
cp -f ${TEMP_PROXY_SCHEDULER_CFG} ${PERCONA_SCHEDULER_CFG}
6969
fi
7070
SSL_INTERNAL_DIR=${SSL_INTERNAL_DIR:-/etc/proxysql/ssl-internal}
7171
if [ -f "${SSL_INTERNAL_DIR}/ca.crt" ]; then
7272
CA=${SSL_INTERNAL_DIR}/ca.crt
73-
sed "s:^sslCertificatePath.*= .*\"$:sslCertificatePath = \"${SSL_INTERNAL_DIR}\":" ${PERCONA_SCHEDULER_CFG} > ${TEMP_PROXY_SCHEDULER_CFG}
74-
cp -f ${TEMP_PROXY_SCHEDULER_CFG} ${PERCONA_SCHEDULER_CFG}
73+
sed "s:^sslCertificatePath.*= .*\"$:sslCertificatePath = \"${SSL_INTERNAL_DIR}\":" ${PERCONA_SCHEDULER_CFG} > ${TEMP_PROXY_SCHEDULER_CFG}
74+
cp -f ${TEMP_PROXY_SCHEDULER_CFG} ${PERCONA_SCHEDULER_CFG}
7575
fi
7676

7777
KEY=${SSL_DIR}/tls.key
@@ -87,12 +87,12 @@ if [ -f "$CA" ] && [ -f "$KEY" ] && [ -f "$CERT" ] && [ -n "$PXC_SERVICE" ]; the
8787
sed "s^ssl_p2s_ca=\"\"^ssl_p2s_ca=\"$CA\"^" ${PROXY_CFG} 1<> ${PROXY_CFG}
8888
sed "s^ssl_p2s_key=\"\"^ssl_p2s_key=\"$KEY\"^" ${PROXY_CFG} 1<> ${PROXY_CFG}
8989
sed "s^ssl_p2s_cert=\"\"^ssl_p2s_cert=\"$CERT\"^" ${PROXY_CFG} 1<> ${PROXY_CFG}
90-
# Percona scheduler
91-
sed "s:^sslCa.*=.*\"$:sslCa = \"${CA##*/}\":" ${PERCONA_SCHEDULER_CFG} | \
92-
sed "s:^sslKey.*=.*\"$:sslKey = \"${KEY##*/}\":" | \
93-
sed "s:^sslClient.*=.*\"$:sslClient = \"${CERT##*/}\":" > ${TEMP_PROXY_SCHEDULER_CFG}
94-
cp -f ${TEMP_PROXY_SCHEDULER_CFG} ${PERCONA_SCHEDULER_CFG}
95-
rm ${TEMP_PROXY_SCHEDULER_CFG}
90+
# Percona scheduler
91+
sed "s:^sslCa.*=.*\"$:sslCa = \"${CA##*/}\":" ${PERCONA_SCHEDULER_CFG} | \
92+
sed "s:^sslKey.*=.*\"$:sslKey = \"${KEY##*/}\":" | \
93+
sed "s:^sslClient.*=.*\"$:sslClient = \"${CERT##*/}\":" > ${TEMP_PROXY_SCHEDULER_CFG}
94+
cp -f ${TEMP_PROXY_SCHEDULER_CFG} ${PERCONA_SCHEDULER_CFG}
95+
rm ${TEMP_PROXY_SCHEDULER_CFG}
9696
fi
9797

9898
if [ -f "${SSL_DIR}/tls.key" ] && [ -f "${SSL_DIR}/tls.crt" ]; then

0 commit comments

Comments
 (0)