Skip to content

Commit 58f13b8

Browse files
sych74sych74
authored
Merge pull request #2 from sych74/JE-61990
Je 61990
2 parents 3e66ab6 + 585c820 commit 58f13b8

File tree

2 files changed

+126
-109
lines changed

2 files changed

+126
-109
lines changed

‎manifest.yml‎

Lines changed: 79 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ categories:
1212

1313
logo: /images/magento.png
1414

15-
baseUrl: https://raw.githubusercontent.com/sych74/magento/JE-66684
15+
baseUrl: https://raw.githubusercontent.com/sych74/magento/JE-61990
1616

1717
onBeforeInit: /scripts/beforeinit.js?_r=${fn.random}
1818
onBeforeInstall: /scripts/beforeInstall.js?_r=${fn.random}
1919
nodes: definedInOnBeforeInstall
20+
2021
skipNodeEmails: true
2122

2223
settings:
@@ -72,121 +73,34 @@ settings:
7273

7374
mixins:
7475
- https://raw.githubusercontent.com/sych74/magento/master/configs/vers.yaml
75-
76-
onAfterInstallAddon [nodeGroup:cp, id:cdn]: setupEdgeportCDN
77-
78-
onAfterInstallAddon [nodeGroup:cp, id:letsencrypt-ssl-addon]:
79-
- cmd[cp]: source /opt/letsencrypt/settings && echo $domain
80-
- install:
81-
jps: ${globals.SCRIPTS_PATH}/setupDomain.jps?_r=${fn.random}
82-
settings:
83-
domain: ${response.out}
84-
- cmd[cp]: bash ~/bin/japp.sh ssl on;
85-
86-
onAfterClone:
87-
- install:
88-
jps: ${globals.SCRIPTS_PATH}/setupDomain.jps?_r=${fn.random}
89-
envName: ${event.response.env.envName}
90-
settings:
91-
domain: ${event.response.env.domain}
92-
93-
- install:
94-
jps: ${globals.SCRIPTS_PATH}/setupCDN.jps?_r=${fn.random}
95-
envName: ${event.response.env.envName}
96-
97-
onBeforeMigrate:
98-
- cmd[${nodes.cp.master.id}]: php /var/www/webroot/ROOT/bin/magento config:show web/unsecure/base_url | cut -d'/' -f3;
99-
- if (/${response.out}/.test(env.domain)):
100-
cmd[${nodes.cp.master.id}]: echo true > ~/migrate
101-
- else:
102-
cmd[${nodes.cp.master.id}]: echo false > ~/migrate
103-
104-
onAfterMigrate:
105-
- cmd[${nodes.cp.master.id}]: if test -f ~/migrate; then cat ~/migrate; fi
106-
- if (/${response.out}/.test(true)):
107-
- install:
108-
jps: ${globals.SCRIPTS_PATH}/setupDomain.jps?_r=${fn.random}
109-
settings:
110-
domain: ${env.domain}
11176

11277
globals:
113-
SCRIPTS_PATH: https://raw.githubusercontent.com/sych74/magento-cluster/JE-66684/scripts
114-
DB_USER: jelastic-${fn.random}
115-
DB_PASS: ${fn.password(10)}
78+
MG_SCRIPTS_PATH: https://raw.githubusercontent.com/sych74/magento-cluster/JE-66684/scripts
79+
DB_USER: ${settings.DB_USER:user-[fn.random]}
80+
DB_PASS: ${settings.DB_PASS:[fn.password(10)]}
11681
DB_HOST: sqldb
117-
ES_PASS: ${fn.password(10)}
82+
ES_PASS: ${settings.ES_PASS:[fn.password(10)]}
11883
PROTOCOL: http
119-
MG_ADMIN_PASS: ${fn.password(10)}
120-
LS_ADMIN_PASS: ${fn.password(10)}
84+
MG_ADMIN_PASS: ${settings.MG_ADMIN_PASS:[fn.password(10)]}
85+
LS_ADMIN_PASS: ${settings.LS_ADMIN_PASS:[fn.password(10)]}
12186
SUCCESS: success
12287
EMAIL: default
12388

12489
onInstall:
12590
- addLimits
126-
- script: ${globals.SCRIPTS_PATH}/idna.js
127-
- setGlobals:
128-
DOMAIN: ${response.domain}
129-
91+
- initLEsettings
92+
- setupNode
93+
- setupOpenSearch
94+
- setProtocol
95+
- setDomain
13096
- createUserDB
131-
132-
- log: Nodes configurations
133-
- install: https://raw.githubusercontent.com/jelastic/templates/master/config_v2.jps?_r=${fn.random}
134-
settings:
135-
targetGroup: cp
136-
targetNodes: cp
137-
optimization: magento
138-
139-
- cmd[cp]: if test -f /usr/local/sbin/optimization.sh; then bash /usr/local/sbin/optimization.sh &>> /var/log/run.log; fi
140-
141-
- if (/llsmp/.test("${nodes.cp.nodeType}")):
142-
- cmd[cp]: jem passwd set -p ${globals.LS_ADMIN_PASS}
143-
user: root
144-
145-
- setupOpenSearch
146-
14797
- installMagento
148-
149-
- initLEwebroot
150-
151-
- if (('${settings.le_addon:false}' == 'true') || ('${settings.cdn_addon:false}' == 'true')):
152-
- script: |
153-
var actions = [];
154-
if ('${settings.le_addon:false}' == 'true')
155-
actions.push({
156-
jps: "https://github.com/jelastic-jps/lets-encrypt/blob/master/manifest.jps?_r=${fn.random}?_r=${fn.random}",
157-
nodeGroup: "cp",
158-
skipEmail: "true",
159-
settings: {
160-
test: false,
161-
skipEmail: true,
162-
customDomains: "${globals.DOMAIN}",
163-
fallbackToX1: true,
164-
webroot: true,
165-
webrootPath: "/var/www/webroot/ROOT/pub"
166-
}
167-
});
168-
if ('${settings.cdn_addon:false}' == 'true')
169-
actions.push({
170-
jps: "https://raw.githubusercontent.com/edgeport/cdn/master/manifest.yml?_r=${fn.random}",
171-
nodeGroup: "cp",
172-
skipEmail: true,
173-
settings: {
174-
note: "${settings.noteCDN:}"
175-
}
176-
});
177-
return { result: 0, onAfterReturn: { install: actions } };
178-
179-
- if ('${settings.le_addon:false}' == 'true'):
180-
- cmd[cp]: source /opt/letsencrypt/settings && echo $domain
181-
- install:
182-
jps: ${globals.SCRIPTS_PATH}/setupDomain.jps?_r=${fn.random}
183-
settings:
184-
domain: ${response.out}
185-
- cmd[cp]: bash ~/bin/japp.sh ssl on;
186-
- setGlobals:
187-
PROTOCOL: https
188-
189-
- if ('${settings.cdn_addon:false}' == 'true'): setupEdgeportCDN
98+
- if (${settings.le_addon:false}):
99+
- installLEaddon
100+
- setupLEdomain
101+
- if (${settings.cdn_addon:false}):
102+
- installCDN
103+
- setupCDN
190104

191105
actions:
192106
addLimits:
@@ -195,32 +109,88 @@ actions:
195109
validation :
196110
maxCount: 1
197111

112+
setProtocol:
113+
- script: |
114+
return {
115+
result:0,
116+
ssl: jelastic.billing.account.GetQuotas('environment.jelasticssl.enabled').array[0].value
117+
}
118+
- if (${response.ssl} || ${settings.le-addon:false}):
119+
setGlobals:
120+
PROTOCOL: https
121+
122+
setDomain:
123+
- script: ${globals.MG_SCRIPTS_PATH}/idna.js
124+
domains: ${env.domain}
125+
- setGlobals:
126+
DOMAIN: ${response.domains}
127+
198128
createUserDB:
199129
- log: Create user for DataBase
200130
- cmd [sqldb]: |-
201131
wget https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log
202132
bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log
203133
jem passwd set -p ${globals.DB_PASS} &>> /var/log/run.log
204134
user: root
205-
206-
initLEwebroot:
135+
136+
installLEaddon:
137+
- install: https://github.com/jelastic-jps/lets-encrypt/blob/master/manifest.jps?_r=${fn.random}
138+
nodeGroup: cp
139+
skipEmail: true
140+
settings:
141+
test: false
142+
skipEmail: true
143+
fallbackToX1: true
144+
webrootPath: /var/www/webroot/ROOT/pub
145+
webroot: true
146+
147+
initLEsettings:
207148
- cmd[cp]: |-
208149
[ ! -d /var/lib/jelastic/keys/letsencrypt ] && mkdir -p /var/lib/jelastic/keys/letsencrypt;
209150
echo "webroot=true" > /var/lib/jelastic/keys/letsencrypt/settings-custom;
210151
echo "webrootPath=/var/www/webroot/ROOT/pub" >> /var/lib/jelastic/keys/letsencrypt/settings-custom;
211152
echo "test=false" >> /var/lib/jelastic/keys/letsencrypt/settings-custom;
212153
user: root
213154
214-
setupEdgeportCDN:
155+
setupLEdomain:
156+
- cmd[cp]: source /opt/letsencrypt/settings && echo $domain
157+
- install:
158+
jps: ${globals.MG_SCRIPTS_PATH}/setupDomain.jps?_r=${fn.random}
159+
settings:
160+
domain: ${response.out}
161+
- cmd[cp]: bash ~/bin/japp.sh ssl on;
162+
163+
installCDN:
164+
- install: https://raw.githubusercontent.com/edgeport/cdn/master/manifest.yml?_r=${fn.random}
165+
nodeGroup: cp
166+
skipEmail: true
167+
settings:
168+
note: ${settings.noteCDN:}
169+
170+
setupCDN:
215171
- script: return jelastic.dev.scripting.Eval("c05ffa5b45628a2a0c95467ebca8a0b4", session, "cdn.info", {partnerCode:1})
216172
- setGlobals:
217173
CDN: ${env.envName}-${response.response.partnerCode}.cdn.jelastic.net
218174
SUCCESS: success-cdn
219175
EMAIL: cdn
220176
- cmd[${nodes.cp.master.id}]: bash ~/bin/japp.sh edgeportCDN --cdn-url ${globals.CDN}
221177

178+
setupNode:
179+
- log: Nodes configurations
180+
- install: https://raw.githubusercontent.com/jelastic/templates/master/config_v2.jps?_r=${fn.random}
181+
settings:
182+
targetGroup: cp
183+
targetNodes: cp
184+
optimization: magento
185+
186+
- cmd[cp]: if test -f /usr/local/sbin/optimization.sh; then bash /usr/local/sbin/optimization.sh &>> /var/log/run.log; fi
187+
188+
- if (/llsmp/.test("${nodes.cp.nodeType}")):
189+
- cmd[cp]: jem passwd set -p ${globals.LS_ADMIN_PASS}
190+
user: root
191+
222192
installMagento:
223-
- install: ${globals.SCRIPTS_PATH}/install.jps
193+
- install: ${globals.MG_SCRIPTS_PATH}/install.jps
224194
settings:
225195
db_host: ${globals.DB_HOST}
226196
db_user: ${globals.DB_USER}

‎scripts/events.jps‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
type: update
2+
id: magento-standalone-events
3+
name: Magento Standalone Events
4+
5+
globals:
6+
MG_SCRIPTS_PATH: https://raw.githubusercontent.com/sych74/magento-cluster/JE-66684/scripts
7+
8+
onAfterInstallAddon [nodeGroup:cp, id:cdn]:
9+
install: ${globals.MG_SCRIPTS_PATH}/setupCDN.jps
10+
11+
onAfterInstallAddon [nodeGroup:cp, id:letsencrypt-ssl-addon]:
12+
- cmd[cp]: source /opt/letsencrypt/settings && echo $domain
13+
- install:
14+
jps: ${globals.MG_SCRIPTS_PATH}/setupDomain.jps?_r=${fn.random}
15+
settings:
16+
domain: ${response.out}
17+
- cmd[cp]: bash ~/bin/japp.sh ssl on;
18+
19+
onAfterClone:
20+
- install:
21+
jps: ${globals.MG_SCRIPTS_PATH}/setupDomain.jps?_r=${fn.random}
22+
envName: ${event.response.env.envName}
23+
settings:
24+
domain: ${event.response.env.domain}
25+
26+
- install:
27+
jps: ${globals.MG_SCRIPTS_PATH}/setupCDN.jps?_r=${fn.random}
28+
envName: ${event.response.env.envName}
29+
30+
- script: delete MANIFEST.id; return {result:0, jps:MANIFEST};
31+
- install: ${response.jps}
32+
envName: ${event.response.env.envName}
33+
34+
onBeforeMigrate:
35+
- cmd[${nodes.cp.master.id}]: php /var/www/webroot/ROOT/bin/magento config:show web/unsecure/base_url | cut -d'/' -f3;
36+
- if (/${response.out}/.test(env.domain)):
37+
cmd[${nodes.cp.master.id}]: echo true > ~/migrate
38+
- else:
39+
cmd[${nodes.cp.master.id}]: echo false > ~/migrate
40+
41+
onAfterMigrate:
42+
- cmd[${nodes.cp.master.id}]: if test -f ~/migrate; then cat ~/migrate; fi
43+
- if (/${response.out}/.test(true)):
44+
- install:
45+
jps: ${globals.MG_SCRIPTS_PATH}/setupDomain.jps?_r=${fn.random}
46+
settings:
47+
domain: ${env.domain}

0 commit comments

Comments
 (0)