This repository has been archived by the owner on Feb 13, 2023. It is now read-only.
Vagrantfile cleanup #1332
Merged
Vagrantfile cleanup #1332
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oxyc
commented
Apr 23, 2017
| @@ -1,6 +1,7 @@ | |||
| # -*- mode: ruby -*- | |||
| # vi: set ft=ruby : | |||
| VAGRANTFILE_API_VERSION = '2' unless defined? VAGRANTFILE_API_VERSION | |||
There was a problem hiding this comment.
I don't really see the point of defining this when it could technically be overridden by an earlier vagrant command.
oxyc
commented
Apr 23, 2017
Vagrantfile
Outdated
| config.vm.network :public_network, ip: vconfig['vagrant_public_ip'] | ||
| if vconfig['vagrant_public_ip'] | ||
| config.vm.network :public_network, | ||
| ip: vconfig['vagrant_public_ip'] != '0.0.0.0' ? vconfig['vagrant_public_ip'] : nil |
There was a problem hiding this comment.
My personal preference but I know some prefer to avoid ternary expressions so let me know if you want me to revert it. Also I'm only assuming nil will be the same as not setting the option at all. Should verify that.
oxyc
commented
Apr 23, 2017
Vagrantfile
Outdated
| } | ||
| if synced_folder.include?('options_override') | ||
| synced_folder['options_override'].each do |key, value| | ||
| options[key.to_sym] = value | ||
| end | ||
| end | ||
| config.vm.synced_folder synced_folder['local_path'], synced_folder['destination'], options | ||
| config.vm.synced_folder synced_folder.fetch('local_path'), synced_folder.fetch('destination'), options |
There was a problem hiding this comment.
As these keys are required, it will now throw a key not found (KeyError) if not set.
oxyc
force-pushed
the
vagrantfile-cleanup
branch
3 times, most recently
from
e4f41aa
to
9b15f62
Compare
oxyc
force-pushed
the
vagrantfile-cleanup
branch
2 times, most recently
from
19c9b2d
to
2df9583
Compare
oxyc
force-pushed
the
vagrantfile-cleanup
branch
from
2df9583
to
98fe9f3
Compare
oxyc
force-pushed
the
vagrantfile-cleanup
branch
from
a14cee2
to
b687a8b
Compare
ConditionalAssignment: No way IndentArray: No way AlignParameters: No way
rsync__auto is true by default already. rsync__args has --copy-links as a default.
oxyc
force-pushed
the
vagrantfile-cleanup
branch
from
b687a8b
to
e3f5751
Compare
|
While we're on the 'potential to break small things' release train... I'll loop this into the 4.5.0 release as well. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Inspired by roots/trellis#828.
A first stab at a simple Vagrantfile logic split. Thoughts?