Skip to content

Commit

Permalink
[#79] fix bindfs on rsync mount
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Calef committed Mar 2, 2021
1 parent ac7a399 commit 44d5632
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Only useful on path set to ``root``.<br>
* The ``vagrant rsync-auto`` is launched by default on vagrant up, even with that if you need to force an update you can run ``vagrant rsync``. <b>Terminal should be kept open for rsync-auto: do not close it.</b>
* Rsync is unilateral, your host machine push files to guest but not the other way.<br>
Anyway if it's necessary, after a ``composer update`` for example, you can run ``vagrant rsync-back`` to push files from guest to host.<br>

* After first installation, you must run ``vagrant reload`` to enable file watching with rsync-auto.<br>
[See Rsync option](https://www.vagrantup.com/docs/synced-folders/rsync.html)

#### NFS
Expand Down Expand Up @@ -166,6 +166,9 @@ Disable cron:
./bin/magento cron:remove
```

### Mysql
Percona server 8.0 is installed for version >= 2.4.0

### Elasticsearch
Version 7.6.x of Elasticsearch is available for Magento.<br>
If your Magento version is lower than 2.4 then version 6.x will be installed.<br>
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Vagrant.configure(2) do |config|

# Bindfs options
config.bindfs.default_options = {
force_group: 'www-data',
force_group: 'www-data',
}
# NFS mount
if vmconf['mount'] == 'nfs'
Expand Down
6 changes: 3 additions & 3 deletions dependency.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ def triggers(config, mount, hostName, hostDirectory)
# Run rsync-auto
if !File.file?("#{hostDirectory}/app/etc/di.xml")
trigger.info+= "\r\nrsync-back and rsync auto triggered..."
trigger.info+="\r\nDuration: ~10min. Install is done when rsync-auto will start watching."
trigger.run = {inline: "vagrant rsync-back #{hostName} | vagrant rsync-auto --rsync-chown #{hostName}"}
trigger.info+="\r\nDuration: ~5min. Once installation is complete please run 'vagrant reload'"
trigger.run = {inline: "vagrant rsync-back #{hostName}"}
else
trigger.info+= "\r\nrsync-auto is running..."
trigger.info+= "\033[0m\r\nrsync-auto is running...\e[0m"
trigger.run = {inline: "vagrant rsync-auto --rsync-chown #{hostName}"}
end
end
Expand Down
4 changes: 2 additions & 2 deletions provision/100-magento-pre.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ cat <<-EOF > /home/vagrant/auth.json
{
"http-basic": {
"repo.magento.com": {
"username": "fd2034320e60ae41fc5b7d97cdd084ef",
"password": "81a00592322716753b42dd95b6d5cc3c"
"username": "${PROJECT_COMPOSER_USER}",
"password": "${PROJECT_COMPOSER_PASS}"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions provision/120-magento-post.sh
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ rm -rf "$PROJECT_PATH"/generated/code/
sudo -u vagrant "$PROJECT_PATH"/bin/magento setup:upgrade
sudo -u vagrant "$PROJECT_PATH"/bin/magento deploy:mode:set "$PROJECT_MODE"
sudo -u vagrant "$PROJECT_PATH"/bin/magento cache:enable
sudo -u vagrant "$PROJECT_PATH"/bin/magento cache:flush

# Restart services
/etc/init.d/php"${PROJECT_PHP_VERSION}"-fpm restart
Expand Down

0 comments on commit 44d5632

Please sign in to comment.