Compare commits
	
		
			6 Commits
		
	
	
		
			0c629a5de5
			...
			bac396a52a
		
	
	| Author | SHA1 | Date | 
|---|---|---|
| 
							
							
								
								 | 
						bac396a52a | |
| 
							
							
								
								 | 
						7fec9cdd3f | |
| 
							
							
								
								 | 
						42ce51d6d8 | |
| 
							
							
								 | 
						93b672d829 | |
| 
							
							
								 | 
						7281daec1b | |
| 
							
							
								 | 
						7e434ecbb4 | 
| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
vagrant-hostmanager (1.8.8-1) unstable; urgency=medium
 | 
					vagrant-hostmanager (1.8.9-1) unstable; urgency=medium
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  * Initial release (Closes: #898996)
 | 
					  * Initial release (Closes: #898996)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,4 +19,7 @@ Depends: ruby | ruby-interpreter,
 | 
				
			||||||
         ${shlibs:Depends},
 | 
					         ${shlibs:Depends},
 | 
				
			||||||
         ${misc:Depends}
 | 
					         ${misc:Depends}
 | 
				
			||||||
Description: Vagrant plugin for managing /etc/hosts on guests and host
 | 
					Description: Vagrant plugin for managing /etc/hosts on guests and host
 | 
				
			||||||
 vagrant-hostmanager is a Vagrant plugin that manages the hosts file on guest machines (and optionally the host). Its goal is to enable resolution of multi-machine environments deployed with a cloud provider where IP addresses are not known in advance.
 | 
					 vagrant-hostmanager is a Vagrant plugin that manages the hosts file on guest
 | 
				
			||||||
 | 
					 machines (and optionally the host). Its goal is to enable resolution of
 | 
				
			||||||
 | 
					 multi-machine environments deployed with a cloud provider where IP addresses
 | 
				
			||||||
 | 
					 are not known in advance.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -88,8 +88,8 @@ module VagrantPlugins
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        def update_content(file_content, resolving_machine, include_id, line_endings)
 | 
					        def update_content(file_content, resolving_machine, include_id, line_endings)
 | 
				
			||||||
          id = include_id ? " id: #{read_or_create_id}" : ""
 | 
					          id = include_id ? " id: #{read_or_create_id}" : ""
 | 
				
			||||||
          header = "## vagrant-hostmanager-start#{id}\n"
 | 
					          header = "## vagrant-hostmanager-start#{id}"
 | 
				
			||||||
          footer = "## vagrant-hostmanager-end\n"
 | 
					          footer = "## vagrant-hostmanager-end"
 | 
				
			||||||
          body = get_machines
 | 
					          body = get_machines
 | 
				
			||||||
            .map { |machine| get_hosts_file_entry(machine, resolving_machine) }
 | 
					            .map { |machine| get_hosts_file_entry(machine, resolving_machine) }
 | 
				
			||||||
            .join
 | 
					            .join
 | 
				
			||||||
| 
						 | 
					@ -146,12 +146,12 @@ module VagrantPlugins
 | 
				
			||||||
          if body.empty?
 | 
					          if body.empty?
 | 
				
			||||||
            block = "\n"
 | 
					            block = "\n"
 | 
				
			||||||
          else
 | 
					          else
 | 
				
			||||||
            block = "\n\n" + header + body + footer + "\n"
 | 
					            block = "\n\n" + header + "\n" + body + footer + "\n\n"
 | 
				
			||||||
          end
 | 
					          end
 | 
				
			||||||
          # Pattern for finding existing block
 | 
					          # Pattern for finding existing block
 | 
				
			||||||
          header_pattern = Regexp.quote(header)
 | 
					          header_pattern = Regexp.quote(header)
 | 
				
			||||||
          footer_pattern = Regexp.quote(footer)
 | 
					          footer_pattern = Regexp.quote(footer)
 | 
				
			||||||
          pattern = Regexp.new("\n*#{header_pattern}.*?#{footer_pattern}\n*", Regexp::MULTILINE)
 | 
					          pattern = Regexp.new("[\r\n]*#{header_pattern}.*?#{footer_pattern}[\r\n]*", Regexp::MULTILINE)
 | 
				
			||||||
          # Replace existing block or append
 | 
					          # Replace existing block or append
 | 
				
			||||||
          content = old_content.match(pattern) ? old_content.sub(pattern, block) : old_content.rstrip + block
 | 
					          content = old_content.match(pattern) ? old_content.sub(pattern, block) : old_content.rstrip + block
 | 
				
			||||||
          if line_endings == "crlf"
 | 
					          if line_endings == "crlf"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
module VagrantPlugins
 | 
					module VagrantPlugins
 | 
				
			||||||
  module HostManager
 | 
					  module HostManager
 | 
				
			||||||
    VERSION = '1.8.8'
 | 
					    VERSION = '1.8.9'
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue