landrush 1.1.0.beta.1 → 1.1.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6fdf85d7935a91c069c3502b4be6a10c97937e5
-  data.tar.gz: d3ee3e5dc3b09473d3a401225e97ee631d450e39
+  metadata.gz: 89f28bf5fa282162cba9dc132f50560eb81c75d9
+  data.tar.gz: 25859eb10f91b1c228f8c4b0e80db1a6f27b664f
 SHA512:
-  metadata.gz: 3ef9fea8ed8a474c5eb6ee8e4ee6af181c5321941c8c4a249ed9599a621daf331d4313ae436d0ccffb3d6abb2ec56b312ef0126c029c79ec44d7b2eb4c023a95
-  data.tar.gz: 6b09eba1246096affd1f44a999fb80048c84df0efc8b0f8db0df006dcd07aa5769980ce02992992a4f623a405087198bf910f029e75e35eba11cdf23b80f1237
+  metadata.gz: b407b73d6ad43a9c40407d31e2512526180044f82705d7434476f8e22be53cec32ec8748edb4ef63890355365917eb1a5290dfc1016ae026da7784ff12cc3f7e
+  data.tar.gz: db40198c92d2efc3933ca00e9339ceba69c7f607d5118a438d0d2c9614ba2a183914ce3f26b5c028515d60e936fd6b132ef19698218732fa773f2b94678dae07

data/.rubocop.yml

@@ -5,3 +5,4 @@ AllCops:
     - 'build/**/*'
     - 'vendor/**/*'
     - 'tmp/**/*'
+

data/.rubocop_todo.yml

@@ -89,7 +89,6 @@ Style/GuardClause:
   Exclude:
     - 'lib/landrush/action/teardown.rb'
     - 'lib/landrush/server.rb'
-    - 'test/support/fake_resolver_config.rb'
     - 'test/support/test_server_daemon.rb'
 
 # Offense count: 13
@@ -107,7 +106,6 @@ Style/IfUnlessModifier:
     - 'lib/landrush/action/common.rb'
     - 'lib/landrush/config.rb'
     - 'lib/landrush/server.rb'
-    - 'test/support/fake_resolver_config.rb'
     - 'test/support/test_server_daemon.rb'
 
 # Offense count: 4
@@ -117,13 +115,6 @@ Style/IfUnlessModifier:
 Style/IndentArray:
   EnforcedStyle: consistent
 
-
-# Offense count: 5
-# Cop supports --auto-correct.
-Style/MutableConstant:
-  Exclude:
-    - 'issues/vbox/Vagrantfile'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
@@ -138,7 +129,7 @@ Style/Next:
 Style/PercentLiteralDelimiters:
   Exclude:
     - 'landrush.gemspec'
-    - 'lib/landrush/cap/linux/redirect_dns.rb'
+    - 'lib/landrush/cap/guest/linux/redirect_dns.rb'
     - 'test/landrush/action/setup_test.rb'
     - 'test/landrush/store_test.rb'
 
@@ -148,7 +139,7 @@ Style/PercentLiteralDelimiters:
 # SupportedStyles: lower_case_q, upper_case_q
 Style/PercentQLiterals:
   Exclude:
-    - 'lib/landrush/cap/linux/read_host_visible_ip_address.rb'
+    - 'lib/landrush/cap/guest/linux/read_host_visible_ip_address.rb'
 
 
 # Offense count: 7
@@ -200,7 +191,7 @@ Style/StringLiterals:
 # IgnoredMethods: respond_to
 Style/SymbolProc:
   Exclude:
-    - 'lib/landrush/cap/linux/read_host_visible_ip_address.rb'
+    - 'lib/landrush/cap/guest/linux/read_host_visible_ip_address.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -216,5 +207,5 @@ Style/TrivialAccessors:
 Style/UnneededPercentQ:
   Exclude:
     - 'landrush.gemspec'
-    - 'lib/landrush/cap/linux/add_iptables_rule.rb'
-    - 'lib/landrush/cap/linux/read_host_visible_ip_address.rb'
+    - 'lib/landrush/cap/guest/linux/add_iptables_rule.rb'
+    - 'lib/landrush/cap/guest/linux/read_host_visible_ip_address.rb'

data/.travis.yml

@@ -8,7 +8,7 @@ cache: bundler
 rvm:
   - 2.0.0
 
-sudo: false
+sudo: required
 
 addons:
   apt:

data/README.md

@@ -28,6 +28,7 @@ problems using Landrush on Windows please let us know.
     - [Additional CLI commands](#additional-cli-commands)
 - [Miscellaneous Tricks and Tips](#miscellaneous-tricks-and-tips)
     - [How to avoid providing sudo password on OS X](#how-to-avoid-providing-sudo-password-on-os-x)
+    - [Guest is unable to access the Internet](#guest-is-unable-to-access-the-internet)
 - [Development](#development)
 - [Help Out!](#help-out)
 
@@ -146,8 +147,9 @@ work for anything.
 <a name="unmatched-queries"></a>
 ### Unmatched Queries
 
-Any DNS queries that do not match will be passed through to an upstream DNS server, so this will be
-able to serve as the one-stop shop for your guests' DNS needs.
+Any DNS queries that do not match any of Landrush'es configuration data, will be passed
+through to an upstream DNS server. Per default Landrush uses Google's DNS server with the
+IP _8.8.8.8_.
 
 If you would like to configure your own upstream servers, add upstream entries to your
 `Vagrantfile` like so:
@@ -177,7 +179,12 @@ through the host's VPN connection).
 ### Visibility on the Host
 
 Visibility on the host means that the hostname of the VMs can be resolved on the host's DNS system.
-Depending on the OS this might require some manual configuration.
+Landrush will attempt an automatic configuration of the host, but depending on the OS, manual
+configuration might be required as well.
+
+To disable this functionality:
+
+    config.landrush.host_redirect_dns = false
 
 <a name="os-x"></a>
 #### OS X
@@ -190,8 +197,11 @@ that points lookups for hostnames ending in your `config.landrush.tld` domain to
 <a name="linux"></a>
 #### Linux
 
-Though it's not automatically set up by Landrush, similar behavior can be achieved on Linux hosts
-with `dnsmasq`. You can integrate Landrush with `dnsmasq` on Ubuntu like so (tested on Ubuntu 13.10):
+Landrush tries to achieve the same behavior on Linux hosts using
+`dnsmasq`. For some Linux distributions this happens automatically (you might
+have to provide your _sudo_ password). If Landrush does not know how to install and
+start `dnsmasq` on your favorite Linux distribution, you can adjust the following
+example from Ubuntu:
 
     sudo apt-get install -y resolvconf dnsmasq
     sudo sh -c 'echo "server=/vagrant.test/127.0.0.1#10053" > /etc/dnsmasq.d/vagrant-landrush'
@@ -308,6 +318,20 @@ configuration. Make sure to edit your `/etc/sudoers` configuration via `sudo vis
     %admin ALL=(ALL) NOPASSWD: VAGRANT_LANDRUSH_HOST_MKDIR, VAGRANT_LANDRUSH_HOST_CP, VAGRANT_LANDRUSH_HOST_CHMOD
     # End Landrush config
 
+<a name="guest-is-unable-to-access-the-internet"></a>
+### Guest is unable to access the Internet
+
+In some network configuration the access to outside DNS servers is restricted
+(firewalls, VPN, etc). Since unmatched DNS queries are per default passed through to
+Google's DNS servers, this can lead to the fact that the guest cannot access anything
+in the outside world.
+If you are having problem with the guest's DNS, verify that you can access Google's
+DNS server under _8.8.8.8_. If it does not work, you will need to set a custom
+upstream DNS server. Check your network configuration on the host or ask your network
+administrator about the right DNS server address to use. You can set the custom
+DNS server via the _config.landrush.upstream_ option (see section about
+[unmatched queries](#unmatched-queries)).
+
 <a name="development"></a>
 ## Development
 

data/lib/landrush.rb

@@ -12,8 +12,6 @@ require 'rubydns'
 
 require 'landrush/dependent_vms'
 require 'landrush/plugin'
-require 'landrush/resolver_config'
-require 'landrush/win_network_config'
 require 'landrush/server'
 require 'landrush/store'
 require 'landrush/version'

data/lib/landrush/action/setup.rb

@@ -34,24 +34,14 @@ module Landrush
       def post_boot_setup
         record_machine_dns_entry
         setup_static_dns
-        setup_host_resolver(env)
+        return unless machine.config.landrush.host_redirect_dns?
+        env[:host].capability(:configure_visibility_on_host, host_ip_address, config.tld)
       end
 
       def record_dependent_vm
         DependentVMs.add(machine_hostname)
       end
 
-      def setup_host_resolver(env)
-        if Vagrant::Util::Platform.windows?
-          network_config = WinNetworkConfig.new(env)
-          if network_config.ensure_prerequisites
-            network_config.update_network_adapter(host_ip_address, '127.0.0.1', config.tld)
-          end
-        elsif Vagrant::Util::Platform.darwin?
-          ResolverConfig.new(env).ensure_config_exists!
-        end
-      end
-
       def add_prerequisite_network_interface
         return unless virtualbox? && !private_network_exists?
 

data/lib/landrush/cap/{linux → guest/linux}/add_iptables_rule.rb

@@ -3,7 +3,7 @@ module Landrush
     module Linux
       module AddIptablesRule
         def self.add_iptables_rule(machine, rule)
-          _run(machine, %Q(iptables -C #{rule} 2> /dev/null || iptables -A #{rule}))
+          _run(machine, %(iptables -C #{rule} 2> /dev/null || iptables -A #{rule}))
         end
 
         def self._run(machine, command)

data/lib/landrush/cap/host/darwin/configure_visibility_on_host.rb

@@ -0,0 +1,62 @@
+module Landrush
+  module Cap
+    module Darwin
+      class ConfigureVisibilityOnHost
+        class << self
+          attr_writer :sudo, :config_dir
+
+          def configure_visibility_on_host(env, *_args)
+            @env = env
+            if contents_match?
+              info 'Host DNS resolver config looks good.'
+            else
+              info 'Need to configure the host.'
+              write_config!
+            end
+          end
+
+          private
+
+          def sudo
+            @sudo ||= 'sudo'
+          end
+
+          def config_dir
+            @config_dir ||= Pathname('/etc/resolver')
+          end
+
+          def info(msg)
+            @env.ui.info("[landrush] #{msg}") unless @env.nil?
+          end
+
+          def desired_contents
+            <<-EOS.gsub(/^            /, '')
+            # Generated by landrush, a vagrant plugin
+            nameserver 127.0.0.1
+            port #{Server.port}
+            EOS
+          end
+
+          def config_file
+            config_dir.join(@env.vagrantfile.config.landrush.tld)
+          end
+
+          def contents_match?
+            config_file.exist? && File.read(config_file) == desired_contents
+          end
+
+          def write_config!
+            info 'Momentarily using sudo to put the host config in place...'
+            system "#{self.class.sudo} mkdir #{config_dir}" unless config_dir.directory?
+            Tempfile.open('vagrant_landrush_host_config') do |f|
+              f.write(desired_contents)
+              f.close
+              system "#{sudo} cp #{f.path} #{config_file}"
+              system "#{sudo} chmod 644 #{config_file}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/debian/dnsmasq_installed.rb

@@ -0,0 +1,11 @@
+module Landrush
+  module Cap
+    module Debian
+      class DnsmasqInstalled
+        def self.dnsmasq_installed(_env)
+          system('dpkg -s dnsmasq > /dev/null 2>&1')
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/debian/host.rb

@@ -0,0 +1,11 @@
+module Landrush
+  module Cap
+    module Debian
+      class DebianHost < Vagrant.plugin('2', 'host')
+        def detect?(_env)
+          system("cat /etc/issue | grep 'Debian' > /dev/null 2>&1")
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/debian/install_dnsmasq.rb

@@ -0,0 +1,12 @@
+module Landrush
+  module Cap
+    module Debian
+      class InstallDnsmasq
+        def self.install_dnsmasq(_env)
+          system('sudo apt-get update > /dev/null 2>&1')
+          system('sudo apt-get install -y resolvconf dnsmasq > /dev/null 2>&1')
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/debian/restart_dnsmasq.rb

@@ -0,0 +1,11 @@
+module Landrush
+  module Cap
+    module Debian
+      class RestartDnsmasq
+        def self.restart_dnsmasq(_env)
+          system('sudo service dnsmasq restart > /dev/null 2>&1')
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/linux/configure_visibility_on_host.rb

@@ -0,0 +1,18 @@
+module Landrush
+  module Cap
+    module Linux
+      class ConfigureVisibilityOnHost
+        class << self
+          def configure_visibility_on_host(env, ip, tld)
+            env[:host].capability(:install_dnsmasq) unless env[:host].capability(:dnsmasq_installed)
+            env[:host].capability(:create_dnsmasq_config, ip, tld)
+            env[:host].capability(:restart_dnsmasq)
+          rescue Vagrant::Errors::CapabilityNotFound
+            env[:ui].info('Unable to automatically configure your host. Check the documentation for manual ' \
+              'instructions to configure the visibility on the host.')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/linux/create_dnsmasq_config.rb

@@ -0,0 +1,65 @@
+module Landrush
+  module Cap
+    module Linux
+      module CreateDnsmasqConfig
+        class << self
+          def create_dnsmasq_config(env, _ip, tld)
+            @env = env
+            @tld = tld
+            if contents_match?
+              info 'Host dnsmasq config looks good.'
+            else
+              info 'Need to configure dnsmasq on host.'
+              write_config!
+            end
+          end
+
+          private
+
+          def info(msg)
+            @env.ui.info("[landrush] #{msg}") unless @env.nil?
+          end
+
+          def config_dir
+            @config_dir ||= Pathname('/etc/dnsmasq.d')
+          end
+
+          def desired_contents
+            <<-EOS.gsub(/^ +/, '')
+            # Generated by landrush, a vagrant plugin
+            server=/#{@tld}/127.0.0.1#10053
+            EOS
+          end
+
+          def config_file
+            config_dir.join("vagrant-landrush-#{@tld}")
+          end
+
+          def contents_match?
+            config_file.exist? && File.read(config_file) == desired_contents
+          end
+
+          def write_config!
+            info 'Momentarily using sudo to put the host config in place...'
+            system "sudo mkdir #{config_dir}" unless config_dir.directory?
+            Tempfile.open('vagrant_landrush_host_config') do |f|
+              f.write(desired_contents)
+              f.close
+              system "sudo cp #{f.path} #{config_file}"
+              system "sudo chmod 644 #{config_file}"
+            end
+          end
+
+          def ensure_config_exists!
+            if contents_match?
+              info 'Host DNS resolver config looks good.'
+            else
+              info 'Need to configure the host.'
+              write_config!
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/redhat/dnsmasq_installed.rb

@@ -0,0 +1,11 @@
+module Landrush
+  module Cap
+    module Redhat
+      module DnsmasqInstalled
+        def self.dnsmasq_installed(_env, *_args)
+          system('rpm -qa | grep dnsmasq > /dev/null 2>&1')
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/redhat/install_dnsmasq.rb

@@ -0,0 +1,14 @@
+module Landrush
+  module Cap
+    module Redhat
+      module InstallDnsmasq
+        class << self
+          def install_dnsmasq(_env)
+            system('sudo yum clean all > /dev/null 2>&1')
+            system('sudo yum install -y -q dnsmasq > /dev/null 2>&1')
+          end
+        end
+      end
+    end
+  end
+end