Skip to content

Commit c2dbb86

Browse files
Je 64874 (#52)
* baseUrl * JE-64874 * JE-64874 * JE-64874 * Rename beforeinstall.js to beforeInstall.js * JE-64874 * JE-64310 * JE-64874 * JE-64874 * Update oneregion-cdn.md * JE-64874 * JE-64874 * JE-64765 [Magento standalone/cluster] Update Magento on PHP8.0 * JE-64765 [Magento standalone/cluster] Update Magento on PHP8.0 * JE-64874 [Magento Standalone] Use a separate MariaDB database instead internal Co-authored-by: alexey.lazarenko <dzotic9@gmail.com>
1 parent 1daa848 commit c2dbb86

File tree

6 files changed

+19
-9
lines changed

6 files changed

+19
-9
lines changed

manifest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ logo: /images/magento.png
1515
baseUrl: https://raw.githubusercontent.com/jelastic-jps/magento/v2.2.0
1616

1717
onBeforeInit: /scripts/beforeinit.js?_r=${fn.random}
18-
onBeforeInstall: /scripts/beforeinstall.js?_r=${fn.random}
18+
onBeforeInstall: /scripts/beforeInstall.js?_r=${fn.random}
1919
nodes: definedInOnBeforeInstall
2020
skipNodeEmails: true
2121

@@ -113,7 +113,7 @@ globals:
113113
SCRIPTS_PATH: https://raw.githubusercontent.com/jelastic-jps/magento-cluster/v2.2.0/scripts
114114
DB_USER: jelastic-${fn.random}
115115
DB_PASS: ${fn.password(10)}
116-
DB_HOST: 127.0.0.1
116+
DB_HOST: sqldb
117117
ES_PASS: ${fn.password(10)}
118118
PROTOCOL: http
119119
MG_ADMIN_PASS: ${fn.password(10)}
@@ -189,7 +189,7 @@ onInstall:
189189
actions:
190190
createUserDB:
191191
- log: Create user for DataBase
192-
- cmd [cp]: |-
192+
- cmd [sqldb]: |-
193193
wget https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log
194194
bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log
195195
jem passwd set -p ${globals.DB_PASS} &>> /var/log/run.log
Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var resp = {
66
if ('${settings.ls_addon:false}'== 'true') {
77
resp.nodes.push({
88
nodeType: "llsmp",
9-
engine: "php7.4",
9+
engine: "php8.1",
1010
flexibleCloudlets: ${settings.cp_flexibleCloudlets:32},
1111
fixedCloudlets: ${settings.cp_fixedCloudlets:1},
1212
nodeGroup: "cp",
@@ -31,7 +31,7 @@ if ('${settings.ls_addon:false}'== 'true') {
3131
} else {
3232
resp.nodes.push({
3333
nodeType: "lemp",
34-
engine: "php7.4",
34+
engine: "php8.1",
3535
flexibleCloudlets: ${settings.cp_flexibleCloudlets:32},
3636
fixedCloudlets: ${settings.cp_fixedCloudlets:1},
3737
nodeGroup: "cp",
@@ -43,6 +43,16 @@ if ('${settings.ls_addon:false}'== 'true') {
4343
})
4444
}
4545

46+
resp.nodes.push({
47+
nodeType: "mariadb104",
48+
count: 1,
49+
flexibleCloudlets: ${settings.st_flexibleCloudlets:8},
50+
fixedCloudlets: ${settings.st_fixedCloudlets:1},
51+
nodeGroup: "sqldb",
52+
displayName: "Database"
53+
})
54+
55+
4656
resp.nodes.push({
4757
nodeType: "opensearch",
4858
tag: "1.3.1-openjdk-11.0.15",

success/email/lemp/oneregion-cdn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Use the following credentials to access the admin panel:
1010

1111
Manage the database nodes using the next credentials:
1212

13-
**phpMyAdmin Panel**: [https://${env.domain}:8443/](https://${env.domain}:8443/)
13+
**phpMyAdmin Panel**: [https://node${nodes.sqldb.master.id}-${env.domain}/](https://node${nodes.sqldb.master.id}-${env.domain}/)
1414
**Username**: ${globals.DB_USER}
1515
**Password**: ${globals.DB_PASS}
1616

success/email/lemp/oneregion-default.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Use the following credentials to access the admin panel:
88

99
Manage the database nodes using the next credentials:
1010

11-
**phpMyAdmin Panel**: [https://${env.domain}:8443/](https://${env.domain}:8443/)
11+
**phpMyAdmin Panel**: [https://node${nodes.sqldb.master.id}-${env.domain}/](https://node${nodes.sqldb.master.id}-${env.domain}/)
1212
**Username**: ${globals.DB_USER}
1313
**Password**: ${globals.DB_PASS}
1414

success/email/llsmp/oneregion-cdn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Use the following credentials to access the LiteSpeed WEB Server admin console:
1616

1717
Manage the database nodes using the next credentials:
1818

19-
**phpMyAdmin Panel**: [https://${env.domain}:8443/](https://${env.domain}:8443/)
19+
**phpMyAdmin Panel**: [https://node${nodes.sqldb.master.id}-${env.domain}/](https://node${nodes.sqldb.master.id}-${env.domain}/)
2020
**Username**: ${globals.DB_USER}
2121
**Password**: ${globals.DB_PASS}
2222

success/email/llsmp/oneregion-default.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Use the following credentials to access the LiteSpeed WEB Server admin console:
1414

1515
Manage the database nodes using the next credentials:
1616

17-
**phpMyAdmin Panel**: [https://${env.domain}:8443/](https://${env.domain}:8443/)
17+
**phpMyAdmin Panel**: [https://node${nodes.sqldb.master.id}-${env.domain}/](https://node${nodes.sqldb.master.id}-${env.domain}/)
1818
**Username**: ${globals.DB_USER}
1919
**Password**: ${globals.DB_PASS}
2020

0 commit comments

Comments
 (0)