Skip to content

Commit f4c2f1d

Browse files
authored
Magento version update
1 parent 38fbc92 commit f4c2f1d

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

magento/manifest.jps

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ globals:
2727
DB_USER: jelastic-${fn.random}
2828
DB_PASS: ${fn.password(20)}
2929
ADMIN_PASSWD: ${fn.password(20)}
30-
CONFIGS_PATH: https://raw.githubusercontent.com/jelastic-jps/magento-cluster/master/configs
30+
CONFIGS_PATH: https://raw.githubusercontent.com/jelastic-jps/magento-cluster/master
3131

3232
ssl: false
3333
nodes:
@@ -45,7 +45,6 @@ nodes:
4545

4646
onInstall:
4747
- createDb
48-
- setupCP
4948
- deployMagento
5049
- setupMagento
5150

@@ -63,20 +62,26 @@ actions:
6362
name: ${settings.magento_version}
6463
context: ROOT
6564

66-
setupCP:
67-
- cmd[cp]: |-
68-
wget ${globals.CONFIGS_PATH}/php/extensions.ini -O /etc/php.d/extensions.ini;
69-
sudo /etc/init.d/nginx restart;
70-
7165
setupMagento:
72-
- cmd[cp]: |-
73-
cd /var/www/webroot/ROOT/bin && chmod a+x magento
74-
/usr/bin/php magento setup:install -s '--backend-frontname=admin' '--db-host=DB'
75-
'--db-name=magento' '--db-user=${globals.DB_USER}' '--db-password=${globals.DB_PASS}'
76-
'--base-url=${env.url}' '--admin-firstname=admin' '--admin-lastname=adminlast'
77-
'--admin-email=${user.email}' '--admin-user=admin' '--admin-password=${globals.DB_ADMIN}' &> /dev/null
78-
/usr/bin/php magento indexer:reindex && /usr/bin/php magento cache:flush &> /dev/null
79-
sed -i "162s/select]/select->limit(10000000000)]/" /var/www/webroot/ROOT/vendor/magento/framework/Search/Adapter/Mysql/Mapper.php
66+
- if (/Magento-CE-1.9/.test("${settings.magento_version}")):
67+
cmd[cp]:
68+
- wget ${globals.CONFIGS_PATH}/configs/nginx/site-default-mg19.conf -O /etc/nginx/conf.d/site-default.conf
69+
- wget ${globals.CONFIGS_PATH}/configs/nginx/nginx.conf -O /etc/nginx/nginx.conf
70+
- wget ${globals.CONFIGS_PATH}/configs/php/extensions.ini -O /etc/php.d/extensions.ini;
71+
- sudo /etc/init.d/nginx restart;
72+
- wget ${globals.CONFIGS_PATH}/scripts/setupMG19.sh -O /tmp/setupMG19.sh && bash -x /tmp/setupMG19.sh
73+
${globals.DB_USER} ${globals.DB_PASS} DB magento ${globals.ADMIN_PASSWD}
74+
/var/www/webroot/ROOT ${env.url} ${user.email} &>> /var/log/run.log
75+
76+
- if (/Magento-CE-2/.test("${settings.magento_version}")):
77+
cmd[cp]:
78+
- wget ${globals.CONFIGS_PATH}/configs/nginx/site-default-mg2.conf -O /etc/nginx/conf.d/site-default.conf
79+
- wget ${globals.CONFIGS_PATH}/configs/nginx/nginx.conf -O /etc/nginx/nginx.conf
80+
- wget ${globals.CONFIGS_PATH}/configs/php/extensions.ini -O /etc/php.d/extensions.ini;
81+
- sudo /etc/init.d/nginx restart;
82+
- wget ${globals.CONFIGS_PATH}/scripts/setupMG2.sh -O /tmp/setupMG2.sh && bash -x /tmp/setupMG2.sh
83+
${globals.DB_USER} ${globals.DB_PASS} DB magento ${globals.ADMIN_PASSWD}
84+
/var/www/webroot/ROOT ${env.url} ${user.email} &>> /var/log/run.log
8085

8186
success:
8287
text: 'Below you will find your admin panel link, username and password.</br></br>

0 commit comments

Comments
 (0)