Skip to content

Commit de8074b

Browse files
author
Benjamin Calef
committed
[#69][#70] always restart elasticsearch service and add doc for w10 issue
2 parents a297404 + 0e5c890 commit de8074b

File tree

3 files changed

+28
-14
lines changed

3 files changed

+28
-14
lines changed

Readme.md renamed to README.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![vagrant](https://img.shields.io/badge/vagrant-debian:stretch-blue.svg?longCache=true&style=flat&label=vagrant&logo=vagrant)](https://app.vagrantup.com/debian/boxes/stretch64)
44
[![dev-box](https://img.shields.io/badge/git/composer-blue.svg?longCache=true&style=flat&label=setup&logo=magento)](https://github.com/zepgram/magento2-fast-vm/blob/master/config.yaml.example)
55
[![mount](https://img.shields.io/badge/nfs/rsync-blue.svg?longCache=true&style=flat&label=mount)](https://github.com/zepgram/magento2-fast-vm/releases)
6-
[![release](https://img.shields.io/badge/release-v1.3.5-blue.svg?longCache=true&style=flat&label=release)](https://github.com/zepgram/magento2-fast-vm/releases)
6+
[![release](https://img.shields.io/badge/release-v1.3.6-blue.svg?longCache=true&style=flat&label=release)](https://github.com/zepgram/magento2-fast-vm/releases)
77
[![license](https://img.shields.io/badge/license-MIT-blue.svg?longCache=true&style=flat&label=license)](https://github.com/zepgram/magento2-fast-vm/blob/master/LICENSE)
88

99
![windows](https://img.shields.io/badge/windows-ok-green.svg?longCache=true&style=flat&label=windows&logo=windows)
@@ -12,7 +12,7 @@
1212

1313
![image](https://user-images.githubusercontent.com/16258478/68086496-0d43e100-fe4d-11e9-95ea-2bce3bee9884.png)    ![image](https://user-images.githubusercontent.com/16258478/68086436-70814380-fe4c-11e9-8ef4-6e39388cc679.png)    ![image](https://user-images.githubusercontent.com/16258478/68086442-7545f780-fe4c-11e9-8c5e-518ddba8735d.png)    ![image](https://user-images.githubusercontent.com/16258478/68086695-ba6b2900-fe4e-11e9-8f4f-68feb9bb0db2.png)    ![image](https://user-images.githubusercontent.com/16258478/68086427-62cbbe00-fe4c-11e9-83d5-24aec5b7c686.png)
1414

15-
[![associate-developer](https://u.magento.com/media/certification/big_associate_developer_m2.png)](https://u.magento.com/certification/directory/dev/2504796/)
15+
[![associate-developer](https://images.youracclaim.com/size/340x340/images/48e73336-c91d-477f-a66f-3ad950acb597/Adobe_Certified_Professional_Experience_Cloud_products_Digital_Badge.png)](https://www.youracclaim.com/earner/earned/badge/406cc91a-0fda-4a6f-846b-19d7f8b59e0a)
1616

1717
## Requirements
1818

@@ -132,12 +132,14 @@ It can be used with ``app`` path if you encountered any issue with NFS and rsync
132132
[See basic usage](https://www.vagrantup.com/docs/synced-folders/basic_usage.html)
133133

134134
### Extra provisions
135-
You can add your custom shell provisions.<br>
136-
For example in order to [import your database from existing project](https://github.com/zepgram/magento2-fast-vm/wiki/Setup-with-database-from-an-existing-project).<br>
135+
You can add extra shell provisions.<br>
137136
Those provisions will be executed on pre-defined sequences:
138-
1. ``extra/001-env.sh`` his purpose is to provide extra environment variables or extra package, executed on ``system-env.sh`` provision
139-
1. ``extra/100-pre-build.sh`` define your specific system configuration before installation, hook on magento ``pre-build.sh`` provision
140-
1. ``extra/120-post-build.sh`` you can execute magento command in this sequence, executed on magento ``post-build.sh`` provision
137+
1. ``extra/001-env.sh`` his purpose is to provide extra environment variables or extra package, executed after script ``001-system-env.sh``
138+
1. ``extra/100-pre-build.sh`` define your specific system configuration before installation, executed after script ``100-magento-pre.sh``
139+
1. ``extra/120-post-build.sh`` you can execute magento command in this sequence, executed after script ``120-magento-post.sh``
140+
141+
- To be executed you must remove the string `-example` from the filename script.
142+
- As an example of use, you can adapt data from your database import by using the script ``100-pre-build.sh``
141143

142144
## Usage
143145

@@ -215,11 +217,13 @@ For version lower than 2.4, you can disable it and fall back to mysql:
215217

216218
## Issues
217219

218-
### WFM
219-
There is a major issue with windows 7 host machine:<br>
220-
When running vagrant up machine hangs, this problem is encountered with newest version of VirtualBox and Vagrant.<br>
221-
- Solution is to upgrade powershell to version 4.0 by downloading [WFM 4.0](https://www.microsoft.com/fr-fr/download/details.aspx?id=40855).
222-
<br>The file setup is Windows6.1-KB2819745<br>
220+
### Windows 10
221+
There is a known [issue with composer installation](https://github.com/zepgram/magento2-fast-vm/issues/70) on windows 10.<br>
222+
This issue could not be solved yet, and has already been reported 2 times.<br>
223+
- It's related to the computer and BIOS configuration.
224+
- It's only with "nfs" setting for mount option.
225+
226+
To solve this, just try to set mount option to "rsync", then after full installation you should be able to fallback to NFS.
223227

224228
### Others
225229
- If you have trouble during installation please open a new issue on this git repository.

provision/010-system-packages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.
4646
dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
4747

4848
# Elasticsearch repository
49+
wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
4950
if $(dpkg --compare-versions "${PROJECT_VERSION}" "lt" "2.3.5-p2"); then
50-
wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
5151
echo "deb https://artifacts.elastic.co/packages/6.x/apt stable main" | tee /etc/apt/sources.list.d/elastic-6.x.list
5252
else
53-
wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
5453
echo "deb https://artifacts.elastic.co/packages/7.x/apt stable main" | tee /etc/apt/sources.list.d/elastic-7.x.list
5554
fi
55+
5656
# PHP and additional
5757
apt-get update -y && apt-get install -y \
5858
php"${PROJECT_PHP_VERSION}" php"${PROJECT_PHP_VERSION}"-common php"${PROJECT_PHP_VERSION}"-cli \

provision/020-system-services.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,20 @@ if $(dpkg --compare-versions "${PROJECT_VERSION}" "lt" "2.3.5-p2"); then
211211
else
212212
sed -i "s|#JAVA_HOME.*|JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre|" /etc/default/elasticsearch
213213
fi
214+
mkdir /etc/systemd/system/elasticsearch.service.d
215+
cat <<'EOF' > /etc/systemd/system/elasticsearch.service.d/override.conf
216+
[Service]
217+
Restart=always
218+
EOF
219+
214220
/bin/systemctl daemon-reload
215221
/bin/systemctl enable elasticsearch.service
216222
/bin/systemctl start elasticsearch.service
217223

224+
225+
# -----------------------------------------------------------------------------------------------------
226+
227+
218228
# Server permissions
219229
mkdir -p /var/www/html
220230

0 commit comments

Comments
 (0)