Merge pull request #22 from jelastic-jps/stage-cluster

sych74 · web-flow · commit 2cf0a64e81f8 · 2023-08-21T13:48:07.000+02:00
Stage cluster
diff --git a/addons/auto-clustering/auto-cluster.jps b/addons/auto-clustering/auto-cluster.jps
@@ -9,7 +9,7 @@ description:
     healthcheck and autodiscovery of newly added DB nodes
   short: Scalable MySQL cluster with ProxySQL for even load distribution
 
-baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/stage-cluster
 
 logo: https://github.com/raw/jelastic-jps/mysql-cluster/master/images/mysql-logo.png
 
diff --git a/addons/auto-clustering/scripts/auto-cluster-logic.jps b/addons/auto-clustering/scripts/auto-cluster-logic.jps
@@ -40,15 +40,15 @@ onInstall:
         REPLICA_PSWD: ${fn.password(20)}
         SCHEME: ${settings.scheme}
 
-  - install: 
-      jps: https://github.com/raw/jelastic-jps/mysql-cluster/master/addons/recovery/manifest.yml?_r=${fn.random}
+  - install:
+      jps: https://github.com/raw/dimkadt/mysql-cluster/master/addons/recovery/manifest.yml?_r=${fn.random}
       nodeGroup: sqldb
       targetNodes: sqldb
       settings:
         install: true
  
   - install: 
-      jps: https://github.com/raw/jelastic-jps/mysql-cluster/master/addons/check-corrupts/manifest.yml?_r=${fn.random}
+      jps: https://github.com/raw/dimkadt/mysql-cluster/master/addons/check-corrupts/manifest.yml?_r=${fn.random}
       nodeGroup: sqldb
       targetNodes: sqldb
       settings:
diff --git a/addons/mariadb-cluster.json b/addons/mariadb-cluster.json
@@ -1,5 +1,5 @@
 {
-    "jps": "https://github.com/raw/jelastic-jps/mysql-cluster/v2.4.1/addons/auto-clustering/auto-cluster.jps",
+    "jps": "https://github.com/raw/dimkadt/mysql-cluster/v3.0.0/addons/auto-clustering/auto-cluster.jps",
     "defaultState": false,
     "skipOnEnvInstall": true,
     "nodeGroupData": {
diff --git a/addons/mariadb104-cluster.json b/addons/mariadb104-cluster.json
@@ -1,5 +1,5 @@
 {
-    "jps": "https://github.com/raw/jelastic-jps/mysql-cluster/v2.3.0/addons/auto-clustering/auto-cluster.jps",
+    "jps": "https://github.com/raw/dimkadt/mysql-cluster/v3.0.0/addons/auto-clustering/auto-cluster.jps",
     "defaultState": false,
     "skipOnEnvInstall": true,
     "nodeGroupData": {
diff --git a/addons/mysql-cluster.json b/addons/mysql-cluster.json
@@ -1,5 +1,5 @@
 {
-    "jps": "https://github.com/raw/jelastic-jps/mysql-cluster/v2.4.1/addons/auto-clustering/auto-cluster.jps",
+    "jps": "https://github.com/raw/dimkadt/mysql-cluster/v3.0.0/addons/auto-clustering/auto-cluster.jps",
     "defaultState": false,
     "skipOnEnvInstall": true,
     "nodeGroupData": {
diff --git a/addons/recovery/manifest.yml b/addons/recovery/manifest.yml
@@ -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://github.com/raw/jelastic-jps/mysql-cluster/v2.5.0/addons/recovery
+baseUrl: https://github.com/raw/dimkadt/mysql-cluster/v2.5.0/addons/recovery
 
 targetNodes:
   nodeGroup: sqldb
diff --git a/manifest.yml b/manifest.yml
@@ -16,7 +16,7 @@ logo: /images/mysql-mariadb-percona-logo.png?_r=1
 
 onBeforeInit: /scripts/settings.js?_r=${fn.random}
 
-baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/stage-cluster
 
 settings:
   fields:
diff --git a/scripts/galera.jps b/scripts/galera.jps
@@ -3,7 +3,7 @@ id: mysql-galera-cluster
 name: MariaDB Galera Cluster
 description: MariaDB Galera Auto Clustering
 
-baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/stage-cluster
 
 success:
   text: /texts/phpmyadmin-credentials.md
diff --git a/scripts/master-master.jps b/scripts/master-master.jps
@@ -3,7 +3,7 @@ id: mysql-master-master-replication-cluster
 name: MySQL/MariaDB/Percona Primary-Primary Replication Database Cluster
 description: 'DB Auto Clustering: 1 x Primary + N x Secondary'
 
-baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/stage-cluster
 
 success:
    text: /texts/phpmyadmin-credentials.md
@@ -88,7 +88,7 @@ actions:
     
   setupPrimaryPrimaryReplication:
     - cmd[${globals.primary2_id}]: |-
-        curl --silent https://github.com/raw/jelastic-jps/mysql-cluster/master/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh;
+        curl --silent https://github.com/raw/jelastic-jps/mysql-cluster/stage-addon/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh;
         bash /tmp/db-recovery.sh  --scenario restore_primary_from_primary --donor-ip ${globals.primary1_ip};
       user: root
   
diff --git a/scripts/master-slave.jps b/scripts/master-slave.jps
@@ -3,7 +3,7 @@ id: mysql-master-slave-replication-cluster
 name: MySQL/MariaDB/Percona Primary-Secondary Replication Database Cluster
 description: 'DB Auto Clustering: 1 x Primary + N x Secondary'
 
-baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/stage-cluster
 
 success:
   text: /texts/phpmyadmin-credentials.md
@@ -83,6 +83,6 @@ actions:
       - setGlobals:
           PRIMARY_IP: ${nodes.sqldb.master.address}
     - cmd[${this}]: |-
-        curl --silent https://github.com/raw/jelastic-jps/mysql-cluster/master/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh; 
+        curl --silent https://github.com/raw/jelastic-jps/mysql-cluster/stage-addon/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh; 
         bash /tmp/db-recovery.sh --scenario restore_secondary_from_primary --donor-ip ${globals.PRIMARY_IP};
       user: root
diff --git a/scripts/proxy-galera.jps b/scripts/proxy-galera.jps
@@ -3,7 +3,7 @@ id: mysql-proxy-galera-cluster
 name: Galera/XtraDB Cluster with ProxySQL
 description: Galera/XtraDB Cluster
 
-baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://github.com/raw/dimkadt/mysql-cluster/v3.0.0
 
 success: /texts/proxy-entrypoint.md
 
diff --git a/scripts/proxy-master-slave.jps b/scripts/proxy-master-slave.jps
@@ -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://github.com/raw/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://github.com/raw/dimkadt/mysql-cluster/v3.0.0
 
 success: /texts/proxy-entrypoint.md
 
diff --git a/scripts/setupUser.sh b/scripts/setupUser.sh
@@ -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."
diff --git a/scripts/xtradb.jps b/scripts/xtradb.jps
@@ -3,7 +3,7 @@ id: percona-xtradb-cluster
 name: Percona XtraDB Cluster
 description: Percona XtraDB Auto Clustering
 
-baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://github.com/raw/jelastic-jps/mysql-cluster/stage-cluster
 
 success:
   text: /texts/phpmyadmin-credentials.md

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "jps": "https://github.com/raw/jelastic-jps/mysql-cluster/v2.4.1/addons/auto-clustering/auto-cluster.jps",`
	`2`	`+ "jps": "https://github.com/raw/dimkadt/mysql-cluster/v3.0.0/addons/auto-clustering/auto-cluster.jps",`
`3`	`3`	`"defaultState": false,`
`4`	`4`	`"skipOnEnvInstall": true,`
`5`	`5`	`"nodeGroupData": {`