Skip to content

V3.0.0 #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions addons/auto-clustering/scripts/auto-cluster-logic.jps
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ onInstall:
REPLICA_PSWD: ${fn.password(20)}
SCHEME: ${settings.scheme}

- install:
jps: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-addon/addons/recovery/manifest.yml?_r=${fn.random}
- install:
jps: https://raw.githubusercontent.com/dimkadt/mysql-cluster/master/addons/recovery/manifest.yml?_r=${fn.random}
nodeGroup: sqldb
targetNodes: sqldb
settings:
install: true

- install:
jps: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-addon/addons/check-corrupts/manifest.yml?_r=${fn.random}
jps: https://raw.githubusercontent.com/dimkadt/mysql-cluster/master/addons/check-corrupts/manifest.yml?_r=${fn.random}
nodeGroup: sqldb
targetNodes: sqldb
settings:
Expand Down
2 changes: 1 addition & 1 deletion addons/mariadb-cluster.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jps": "https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v2.4.1/addons/auto-clustering/auto-cluster.jps",
"jps": "https://raw.githubusercontent.com/dimkadt/mysql-cluster/v3.0.0/addons/auto-clustering/auto-cluster.jps",
"defaultState": false,
"skipOnEnvInstall": true,
"nodeGroupData": {
Expand Down
2 changes: 1 addition & 1 deletion addons/mariadb104-cluster.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jps": "https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v2.3.0/addons/auto-clustering/auto-cluster.jps",
"jps": "https://raw.githubusercontent.com/dimkadt/mysql-cluster/v3.0.0/addons/auto-clustering/auto-cluster.jps",
"defaultState": false,
"skipOnEnvInstall": true,
"nodeGroupData": {
Expand Down
2 changes: 1 addition & 1 deletion addons/mysql-cluster.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jps": "https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v2.4.1/addons/auto-clustering/auto-cluster.jps",
"jps": "https://raw.githubusercontent.com/dimkadt/mysql-cluster/v3.0.0/addons/auto-clustering/auto-cluster.jps",
"defaultState": false,
"skipOnEnvInstall": true,
"nodeGroupData": {
Expand Down
2 changes: 1 addition & 1 deletion addons/recovery/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description:
text: The Database Cluster Recovery add-on performs a comprehensive diagnostic of your MySQL/MariaDB Cluster (Galera, Primary-Primary, Primary-Secondary) to detect any disruptions of the provisioned service. In case of errors, the automatic Cluster Recovery functionality can restore the cluster operability after most of the problems.
short: The add-on performs a comprehensive diagnostic of your database cluster and can perform automatic recovery.

baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v2.5.0/addons/recovery
baseUrl: https://raw.githubusercontent.com/dimkadt/mysql-cluster/v2.5.0/addons/recovery

targetNodes:
nodeGroup: sqldb
Expand Down
2 changes: 1 addition & 1 deletion scripts/proxy-galera.jps
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ id: mysql-proxy-galera-cluster
name: Galera/XtraDB Cluster with ProxySQL
description: Galera/XtraDB Cluster

baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
baseUrl: https://raw.githubusercontent.com/dimkadt/mysql-cluster/v3.0.0

success: /texts/proxy-entrypoint.md

Expand Down
2 changes: 1 addition & 1 deletion scripts/proxy-master-slave.jps
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ id: mysql-proxy-master-slave-cluster
name: MySQL/MariaDB/Percona Database Cluster with ProxySQL
description: ProxySQL Load Balancer Entry Point

baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
baseUrl: https://raw.githubusercontent.com/dimkadt/mysql-cluster/v3.0.0

success: /texts/proxy-entrypoint.md

Expand Down
12 changes: 10 additions & 2 deletions scripts/setupUser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,16 @@ cmd="CREATE USER '$USER'@'localhost' IDENTIFIED BY '$PASSWORD'; CREATE USER '$US
unset resp;
resp=$(mysql -u$USER -p$PASSWORD mysql --execute="SHOW COLUMNS FROM user")
[ -z "$resp" ] && {
encPass=$(echo $ADMIN_PASSWORD | openssl enc -e -a -A -aes-128-cbc -nosalt -pass "pass:TFVhBKDOSBspeSXesw8fElCcOzbJzYed")
$JEM passwd set -p static:$encPass
openssl_version="$(openssl version | sed -r 's/^OpenSSL[[:blank:]]+([0-9]+)[.][^[:space:]]+[[:blank:]]+.*/\1/')"
if (( $openssl_version >= 3 )); then
openssl_parameters='-aes-256-cbc -pbkdf2 -md sha512 -iter 10000 -salt -S 429488b2f3870b4a -iv dcb9fe5ecb4011cd20114119930aadc3'
STATIC="static:"
else
openssl_parameters='-aes-128-cbc -nosalt -A -nosalt'
STATIC="static"
fi
encPass=$(echo $ADMIN_PASSWORD | openssl enc -e -a $openssl_parameters -pass "pass:TFVhBKDOSBspeSXesw8fElCcOzbJzYed")
$JEM passwd set -p $STATIC:$encPass
$MYSQL -uroot -p${ADMIN_PASSWORD} --execute="$cmd"
} || {
echo "[Info] User $user has the required access to the database."
Expand Down