File tree Expand file tree Collapse file tree 4 files changed +2
-24
lines changed Expand file tree Collapse file tree 4 files changed +2
-24
lines changed Original file line number Diff line number Diff line change @@ -59,11 +59,6 @@ up or have a private ip configured will be added to the hosts file.
5959In addition, the ` hostmanager.aliases ` configuration attribute can be used
6060to provide aliases for your host names.
6161
62- On some systems, long alias lines have been reported to cause issues
63- (see [ #60 ] ( https://github.com/smdahlen/vagrant-hostmanager/issues/60 ) ).
64- In such cases, you may render aliases on separate lines by setting
65- ``` hostmanager.aliases_on_separate_lines = true ``` .
66-
6762Example configuration:
6863
6964``` ruby
Original file line number Diff line number Diff line change @@ -7,7 +7,6 @@ class Config < Vagrant.plugin('2', :config)
77 attr_accessor :aliases
88 attr_accessor :include_offline
99 attr_accessor :ip_resolver
10- attr_accessor :aliases_on_separate_lines
1110
1211 alias_method :enabled? , :enabled
1312 alias_method :include_offline? , :include_offline
@@ -20,7 +19,6 @@ def initialize
2019 @include_offline = UNSET_VALUE
2120 @aliases = UNSET_VALUE
2221 @ip_resolver = UNSET_VALUE
23- @aliases_on_separate_lines = UNSET_VALUE
2422 end
2523
2624 def finalize!
@@ -30,7 +28,6 @@ def finalize!
3028 @include_offline = false if @include_offline == UNSET_VALUE
3129 @aliases = [ ] if @aliases == UNSET_VALUE
3230 @ip_resolver = nil if @ip_resolver == UNSET_VALUE
33- @aliases_on_separate_lines = false if @aliases_on_separate_lines == UNSET_VALUE
3431
3532 @aliases = [ @aliases ] . flatten
3633 end
Original file line number Diff line number Diff line change @@ -92,19 +92,8 @@ def get_hosts_file_entry(machine, resolving_machine)
9292 ip = get_ip_address ( machine , resolving_machine )
9393 host = machine . config . vm . hostname || machine . name
9494 aliases = machine . config . hostmanager . aliases
95-
9695 if ip != nil
97- # As per GH-60, we optionally render aliases on separate lines
98- current_machine_config = ( ( resolving_machine && resolving_machine . config ) || @config )
99- if current_machine_config . hostmanager . aliases_on_separate_lines
100- rendered_aliases = aliases . map { |a | "#{ ip } \t #{ a } " } . join ( "\n " )
101- separator = "\n "
102- else
103- rendered_aliases = aliases . join ( " " )
104- separator = "\t "
105- end
106-
107- "#{ ip } \t #{ host } " + separator + rendered_aliases + "\n "
96+ "#{ ip } \t #{ host } \n " + aliases . map { |a | "#{ ip } \t #{ a } " } . join ( "\n " ) + "\n "
10897 end
10998 end
11099
Original file line number Diff line number Diff line change @@ -16,19 +16,16 @@ Vagrant.configure('2') do |config|
1616
1717 config . hostmanager . enabled = true
1818 config . hostmanager . manage_host = true
19- # config.hostmanager.aliases_on_separate_lines = true
2019
2120 config . vm . define :server1 do |server |
2221 server . vm . hostname = 'fry'
2322 server . vm . network :private_network , :ip => '10.0.5.2'
24- server . hostmanager . aliases = %w( alias1 alias2 )
23+ server . hostmanager . aliases = %w( test-alias )
2524 end
2625
2726 config . vm . define :server2 do |server |
2827 server . vm . hostname = 'bender'
2928 server . vm . network :private_network , :ip => '10.0.5.3'
30- server . hostmanager . aliases = %w( alias3 alias4 )
31- server . hostmanager . aliases_on_separate_lines = true
3229 end
3330
3431 config . vm . define :server3 do |server |
You can’t perform that action at this time.
0 commit comments