vagrant-reverse-proxy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26d9391f462c1912d503f0fc872ad82f1171bf26
-  data.tar.gz: 31b74fb24938a8ad11f549bf0750900b1ecef175
+  metadata.gz: 37af02ecaff09d53c0bf6b227f8739ef4e9b6f24
+  data.tar.gz: 510a0c70893fa0571c93f8646072bbd9d616b040
 SHA512:
-  metadata.gz: 10f1d65e39fcfd7877ecdaf91a8d47708179eb9e5cd32e2e73be19ca559e749d475f5edebaa87d6a442e9ccd32b52baec142fbdb7ef100b7ad2c46247a006174
-  data.tar.gz: ecaec449938977b8555bc5811bac8ac1eba378804119a6809cf75df5775a6d0ff103cdcc9f1c591b2c470ab23d0acf9c83385f02f995113b26cbae6fe8b5aa5f
+  metadata.gz: c6293d0ed3a1e1d71d916b940afd676c682b9c58440581e90e918be72ae3a3ef29b5d4f478f3448da9065841152bf91437a24e6ec6dbd5a03aee9e7cb83445eb
+  data.tar.gz: 6aa66013e96de2139073c52d6b1552ef3532a0548aa86ed76dc34e858d87d2ed29db2e7af96c1b3a590f25f523edc1053f15e289faf9b02445e1fc6ce2b8894a

data/README.md

@@ -60,6 +60,19 @@ set that up, you can override the `vhosts` option:
 This will proxy `http://localhost/foo.test` and
 `http://localhost/bar.test` to this VM, with a matching `Host` header.
 
+If you want to customize the vhost path, you can use a hash instead of
+an array:
+
+    config.reverse_proxy.vhosts = {
+        "foo-test" => "foo.test",
+        "bar" => "bar.test"
+        "bar-altport" => {:host => "bar.test", :port => 8080}
+    }
+
+As you can see, this allows you to define which port to connect to
+instead of the default port (which is port 80).
+
+
 ## Adding proxy support to your application
 
 This plugin will instruct NGINX to pass the following headers to your

data/lib/vagrant-reverse-proxy/action.rb

@@ -5,8 +5,6 @@ module VagrantPlugins
     module Action
       include Vagrant::Action::Builtin
 
-      # We (currently) don't distinguish between upping and downing a
-      # machine; we always write a complete config with all machines.
       def self.add_machine
         Vagrant::Action::Builder.new.tap do |builder|
           builder.use(ConfigValidate)

data/lib/vagrant-reverse-proxy/action/write_nginx_config.rb

@@ -59,19 +59,24 @@ module VagrantPlugins
           if @config.reverse_proxy.vhosts
             vhosts = @config.reverse_proxy.vhosts
           else
-            vhosts = [machine.config.vm.hostname || machine.name]
+            host = machine.config.vm.hostname || machine.name
+            vhosts = {host => host}
           end
           ip = get_ip_address(machine)
-          vhosts.collect do |vhost| <<EOF
-location /#{vhost}/ {
-    proxy_set_header Host #{vhost};
+          vhosts.collect do |path, vhost|
+            # Rewrites are matches literally by nginx, which means
+            # http://host:80/... will NOT match http://host/...!
+            port_suffix = vhost[:port] == 80 ? '' : ":#{vhost[:port]}"
+            <<EOF
+location /#{path}/ {
+    proxy_set_header Host #{vhost[:host]};
     proxy_set_header X-Forwarded-For $remote_addr;
     proxy_set_header X-Forwarded-Host $host;
     proxy_set_header X-Forwarded-Port $server_port;
-    proxy_set_header X-Base-Url http://$host:$server_port/#{vhost}/;
+    proxy_set_header X-Base-Url http://$host:$server_port/#{path}/;
 
-    proxy_pass http://#{ip}/;
-    proxy_redirect http://#{vhost}/ /#{vhost}/;
+    proxy_pass http://#{ip}#{port_suffix}/;
+    proxy_redirect http://#{vhost[:host]}#{port_suffix}/ /#{path}/;
 }
 EOF
           end.join("\n")

data/lib/vagrant-reverse-proxy/config.rb

@@ -12,7 +12,23 @@ module VagrantPlugins
 
         def finalize!
           @enabled = false if @enabled == UNSET_VALUE
-          @vhosts = nil if @vhosts == UNSET_VALUE
+          if @vhosts == UNSET_VALUE
+            @vhosts = nil
+          elsif @vhosts.is_a?(Array)
+            # Convert to canonical hash form of
+            # {path => {:host => name, :port => num}}
+            vhosts_hash = {}
+            @vhosts.each {|entry| vhosts_hash[entry] = {:host => entry, :port => 80} }
+            @vhosts = vhosts_hash
+          elsif @vhosts.is_a?(Hash)
+            @vhosts.each do |key, value|
+              if (value.is_a?(String))
+                @vhosts[key] = {:host => value, :port => 80}
+              else
+                value[:port] ||= 80
+              end
+            end
+          end
         end
 
         def validate(machine)
@@ -22,8 +38,27 @@ module VagrantPlugins
             errors << 'enabled must be a boolean'
           end
 
-          unless @vhosts.instance_of?(Array) || @vhosts == nil || @vhosts == UNSET_VALUE
-            errors << 'vhosts must be an array of hostnames (or nil to use default name)'
+          if @vhosts.instance_of?(Array)
+            @vhosts.each do |vhost|
+              unless (vhost.is_a?(String) || vhost.is_a?(Hash))
+                errors << "vhost #{vhost} is not a string or hash"
+              end
+            end
+          elsif @vhosts.instance_of?(Hash)
+            @vhosts.each do |path, vhost|
+              unless path.is_a?(String)
+                errors << "vhost path `#{path}' is not a string"
+              end
+              unless vhost.is_a?(String) || vhost.is_a?(Hash)
+                errors << "Vhost `#{vhost}' for path `#{path}' is not a string or hash"
+              else
+                if vhost.is_a?(Hash) && !vhost[:host]
+                  errors << "Vhost `#{vhost}' for path `#{path}' has no :host key"
+                end
+              end
+            end
+          elsif @vhosts != nil && @vhosts != UNSET_VALUE
+            errors << 'vhosts must be an array of hostnames, a string=>string hash or nil'
           end
 
           { 'Reverse proxy configuration' => errors.compact }

data/lib/vagrant-reverse-proxy/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ReverseProxy
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-reverse-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Bex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler