landrush 0.9.0 → 0.10.0

data/README.md

@@ -42,12 +42,24 @@ This is great for overriding production services for nodes you might be testing
 
 For your convenience, any subdomain of a DNS entry known to landrush will resolve to the same IP address as the entry. For example: given `myhost.vagrant.dev -> 1.2.3.4`, both `foo.myhost.vagrant.dev` and `bar.myhost.vagrant.dev` will also resolve to `1.2.3.4`.
 
-Note that from the __host__, you still can only resolve subdomains of `.vagrant.dev` - so wildcard subdomains only apply to that space. For the __guest__, wildcard subdomains work for anything.
+If you would like to configure your guests to be accessible from the host as subdomains of something other than the default `vagrant.dev`, you can use the `config.landrush.tld` option in your Vagrantfile like so:
+
+    config.landrush.tld = 'vm'
+
+Note that from the __host__, you will only be able to access subdomains of your configured TLD by default- so wildcard subdomains only apply to that space. For the __guest__, wildcard subdomains work for anything.
 
 ### 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.
 
+If you would like to configure your own upstream servers, add upstream entries to your `Vagrantfile` like so:
+
+    config.landrush.upstream '10.1.1.10'
+    # Set the port to 1001
+    config.landrush.upstream '10.1.2.10', 1001
+    # If your upstream is TCP only for some strange reason
+    config.landrush.upstream '10.1.3.10', 1001, :tcp
+
 ### Visibility on the Guest
 
 Linux guests should automatically have their DNS traffic redirected via `iptables` rules to the Landrush DNS server. File an issue if this does not work for you.

data/lib/landrush/action/common.rb

@@ -56,6 +56,17 @@ module Landrush
       def info(msg)
         env[:ui].info "[landrush] #{msg}"
       end
+
+      def log(level, msg)
+        # Levels from github.com/mitchellh/vagrant/blob/master/lib/vagrant/ui.rb
+        valid_levels = [:ask, :detail, :warn, :error, :info, :output, :success]
+
+        if valid_levels.include? level
+          env[:ui].send level, "[landrush] #{msg}"
+        else
+          env[:ui].error "[landrush] (Invalid logging level #{level}) #{msg}"
+        end
+      end
     end
   end
 end

data/lib/landrush/action/setup.rb

@@ -18,6 +18,7 @@ module Landrush
         record_dependent_vm
         add_prerequisite_network_interface
         setup_host_resolver
+        configure_server
         start_server
         setup_static_dns
       end
@@ -37,6 +38,10 @@ module Landrush
         machine.config.vm.network :private_network, type: :dhcp
       end
 
+      def configure_server
+        Store.config.set('upstream', global_config.landrush.upstream_servers)
+      end
+
       def start_server
         return if Server.running?
 
@@ -56,6 +61,11 @@ module Landrush
 
         info "adding machine entry: #{machine_hostname} => #{ip_address}"
 
+        if not machine_hostname.match(global_config.landrush.tld)
+          log :error, "hostname #{machine_hostname} does not match the configured TLD: #{global_config.landrush.tld}"
+          log :error, "You will not be able to access #{machine_hostname} from the host"
+        end
+
         Store.hosts.set(machine_hostname, ip_address)
       end
 

data/lib/landrush/config.rb

@@ -1,10 +1,14 @@
 module Landrush
   class Config < Vagrant.plugin('2', :config)
     attr_accessor :hosts
+    attr_accessor :upstream_servers
 
     def initialize
       @hosts = {}
       @enabled = false
+      @default_upstream = [[:udp, '8.8.8.8', 53], [:tcp, '8.8.8.8', 53]]
+      @default_tld = 'vagrant.dev'
+      @upstream_servers = @default_upstream
     end
 
     def enable(enabled=true)
@@ -23,6 +27,27 @@ module Landrush
       @hosts[hostname] = ip_address
     end
 
+    def tld
+      @tld ||= @default_tld
+    end
+
+    def tld=(tld)
+      @tld = tld
+    end
+
+    def upstream(ip, port=53, protocol=nil)
+      if @upstream_servers == @default_upstream
+        @upstream_servers = []
+      end
+
+      if !protocol
+        @upstream_servers.push [:udp, ip, port]
+        @upstream_servers.push [:tcp, ip, port]
+      else
+        @upstream_servers.push [protocol, ip, port]
+      end 
+    end
+
     def merge(other)
       super.tap do |result|
         result.hosts = @hosts.merge(other.hosts)

data/lib/landrush/resolver_config.rb

@@ -42,7 +42,7 @@ module Landrush
     end
 
     def config_file
-      config_dir.join('vagrant.dev')
+      config_dir.join(@env[:global_config].landrush.tld)
     end
 
     def contents_match?

data/lib/landrush/server.rb

@@ -14,7 +14,8 @@ module Landrush
     end
 
     def self.upstream_servers
-      [[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]]
+      # Doing collect to cast protocol to symbol because JSON store doesn't know about symbols
+      @upstream_servers ||= Store.config.get('upstream').collect {|i| [i[0].to_sym, i[1], i[2]]}
     end
 
     def self.interfaces

data/lib/landrush/store.rb

@@ -4,6 +4,10 @@ module Landrush
       @hosts ||= new(Landrush.working_dir.join('hosts.json'))
     end
 
+    def self.config
+      @config ||= new(Landrush.working_dir.join('config.json'))
+    end
+
     attr_accessor :backing_file
 
     def initialize(backing_file)

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns