Skip to content

Commit

Permalink
Merge pull request #23 from Fatsoma/fix_vagrant
Browse files Browse the repository at this point in the history
Fix vagrant configs
  • Loading branch information
biinari authored Oct 4, 2024
2 parents b8ab68b + fef7491 commit 653bbe6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
1 change: 1 addition & 0 deletions .rsync-exclude
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Excludes:
/.git
/.gitattributes
/.rsync-exclude
/.circleci
/.github
Expand Down
5 changes: 3 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ Vagrant.configure('2') do |config|
fail_with_message "vagrant-bindfs missing, please install the plugin with this command:\nvagrant plugin install vagrant-bindfs"
else
trellis_config.wordpress_sites.each_pair do |name, site|
config.vm.synced_folder local_site_path(site), nfs_path(name), type: 'nfs'
config.vm.synced_folder local_site_path(site), nfs_path(name), type: 'nfs', nfs_udp: false
config.bindfs.bind_folder nfs_path(name), remote_site_path(name, site), u: 'vagrant', g: 'www-data', o: 'nonempty'
end

config.vm.synced_folder ANSIBLE_PATH, '/ansible-nfs', type: 'nfs'
config.vm.synced_folder ANSIBLE_PATH, '/ansible-nfs', type: 'nfs', nfs_udp: false
config.bindfs.bind_folder '/ansible-nfs', ANSIBLE_PATH_ON_VM, o: 'nonempty', p: '0644,a+D'
config.bindfs.bind_folder bin_path, bin_path, perms: '0755'
end
Expand All @@ -105,6 +105,7 @@ Vagrant.configure('2') do |config|
mount_options: folder.fetch('mount_options', [])
}

options[:nfs_udp] = folder.fetch('nfs_udp', false) if folder.fetch('type', 'nfs') == 'nfs'
destination_folder = folder.fetch('bindfs', true) ? nfs_path(folder['destination']) : folder['destination']

config.vm.synced_folder folder['local_path'], destination_folder, options
Expand Down
2 changes: 2 additions & 0 deletions group_vars/development/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ env: development
ferm_enabled: false
mysql_root_password: "{{ vault_mysql_root_password }}" # Define this variable in group_vars/development/vault.yml
web_user: vagrant
composer_home_owner: vagrant
composer_home_group: vagrant
10 changes: 5 additions & 5 deletions vagrant.default.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
vagrant_ip: '192.168.50.5'
vagrant_ip: '192.168.56.5'
vagrant_cpus: 1
vagrant_memory: 1024 # in MB
vagrant_box: 'bento/ubuntu-18.04'
vagrant_box_version: '>= 201807.12.0'
vagrant_ansible_version: '2.7.12'
vagrant_skip_galaxy: false
vagrant_box: 'generic/ubuntu18.04'
vagrant_box_version: '>= 3.2.20'
vagrant_ansible_version: '2.8.4'
vagrant_skip_galaxy: true
vagrant_mount_type: 'nfs'

vagrant_install_plugins: true
Expand Down

0 comments on commit 653bbe6

Please sign in to comment.