vagrant-reverse-proxy 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b88dae7487696d9581390ffc45c65fe8abb635ed
-  data.tar.gz: faa31f9eeb9dd4b915c8b1c23894550a3ebdee56
+  metadata.gz: ad23d444baedd4df858c5720a94e983e31401b9f
+  data.tar.gz: 1049c3a3ab95b7b4fcd517f76182fc0a717e4e5b
 SHA512:
-  metadata.gz: 4b8c1562f636c89252d5aedaf2b9bbb1727131ab07c5ccd528b30ebb0aafb9d790557c018b40bdf134f85b8e7af5e368f17b981b9414691ba3b022ec470a15f4
-  data.tar.gz: aea5ffc4ec2b606dde191179361ca3e17fb3f96c5f8855036fc3fecc6f68c44cf5eca93eb18db9d0f60f4cbb9cb72717b40d112a1b386398bee4d99e590ada97
+  metadata.gz: 2e0fe83f8e191a2193e56a908c7faf00cf0d0c4e957706558d8bf39b3166dcbba3fea5ab3a9e9884a68f995abb7e5841dabb2df5aea7340707b35127bd096e83
+  data.tar.gz: e860d8501191d327a1200e36e2e920775039ea2685a96ef9b48946a923bc34e55d228e5145fd2fb93152a704db11bae889da3a76051fa3cfecb69c43c6b86eac

data/README.md

@@ -72,6 +72,11 @@ an array:
 As you can see, this allows you to define which port to connect to
 instead of the default port (which is port 80).
 
+### Specifying the NGINX configuration file path
+
+If you want to change the location of the managed nginx configuration file, set the `config.reverse_proxy.nginx_config_file` value to a path on your host machine in the Vagrantfile configuration:
+
+    config.reverse_proxy.nginx_config_file = '/usr/local/etc/nginx/vagrant-proxy-config'
 
 ## Adding proxy support to your application
 
@@ -98,3 +103,12 @@ If you're using Symfony, just use `setTrustedProxies()` on your
 `Request` object, and Symfony takes care of the rest.  Note that
 `X-Base-Url` is not supported by either framework, so you'll need to
 add a bit of custom code there if you need to override the base URL.
+
+
+## Changelog
+
+- 0.3 Allow overriding the location of the NGINX configuration file
+  (thanks to Sam Stevens).  Support multiple VMs in a single Vagrant
+  config (suggested by Nicholas Alipaz).
+- 0.2 Support for proxying of multiple ports in `vhosts` config.
+- 0.1 First version

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

@@ -4,42 +4,51 @@ module VagrantPlugins
       class WriteNginxConfig
         def initialize(app, env, action)
           @app = app
-          @global_env = env[:machine].env
-          @provider = env[:machine].provider_name
-          @config = @global_env.vagrantfile.config
           @action = action
         end
 
         def call(env)
           @app.call(env)
 
-          return unless @config.reverse_proxy.enabled?
+          # Does this make much sense?  What if we disable it later
+          # for one specific machine?  Then, the config should still
+          # be removed.
+          return unless env[:machine].config.reverse_proxy.enabled?
 
           # Determine temp file and target file
-          nginx_dir = '/etc/nginx'
-          unless File.directory?(nginx_dir)
-            env[:ui].error("Could not update nginx configuration: directory '#{nginx_dir}' does not exist.  Continuing without proxy...")
+          nginx_config_file = env[:machine].config.reverse_proxy.nginx_config_file || '/etc/nginx/vagrant-proxy-config'
+
+          # Get the directory of the config file
+          nginx_config_dir = File.dirname(nginx_config_file)
+
+          unless File.directory?(nginx_config_dir)
+            env[:ui].error("Could not update nginx configuration: directory '#{nginx_config_dir}' does not exist.  Continuing without proxy...")
             return
           end
-          nginx_site = "#{nginx_dir}/vagrant-proxy-config"
-          tmp_file = @global_env.tmp_path.join('nginx.vagrant-proxies')
+
+          tmp_file = env[:machine].env.tmp_path.join('nginx.vagrant-proxies')
 
           env[:ui].info('Updating nginx configuration. Administrator privileges will be required...')
 
-          machines = get_machines()
-          # This code is so stupid
+          sm = start_marker(env[:machine])
+          em = end_marker(env[:machine])
+
+          # This code is so stupid: We write a tmp file with the
+          # current config, filtered to exclude this machine.  Later,
+          # we put this machine's config back in.  It might have
+          # changed, and might not have been present originally.
           File.open(tmp_file, 'w') do |new|
             begin
-              File.open(nginx_site, 'r') do |old|
-                sm = machines.map {|m| start_marker(m) }
-                em = machines.map {|m| end_marker(m) }
-
+              File.open(nginx_config_file, 'r') do |old|
+                # First, remove old entries for this machine.
                 while ln = old.gets() do
-                  if sm.member?(ln.chomp)
-                    until !ln || em.member?(ln.chomp) do
+                  if sm == ln.chomp
+                    # Skip lines until we find EOF or end marker
+                    until !ln || em == ln.chomp do
                       ln = old.gets()
                     end
                   else
+                    # Keep lines for other machines.
                     new.puts(ln)
                   end
                 end
@@ -49,20 +58,22 @@ module VagrantPlugins
               # we'll create it soon enough.
             end
 
-            if @action == :add
-              machines.each do |m|
-                new.write(start_marker(m)+"\n"+server_block(m)+end_marker(m)+"\n")
+            if @action == :add # Removal is already (always) done above
+              # Write the config for this machine
+              if env[:machine].config.reverse_proxy.enabled?
+                new.write(sm+"\n"+server_block(env[:machine])+em+"\n")
               end
             end
           end
 
-          Kernel.system('sudo', 'cp', tmp_file.to_s, nginx_site)
+          # Finally, copy tmp config to actual config and reload nginx
+          Kernel.system('sudo', 'cp', tmp_file.to_s, nginx_config_file)
           Kernel.system('sudo', 'service', 'nginx', 'reload')
         end
 
         def server_block(machine)
-          if @config.reverse_proxy.vhosts
-            vhosts = @config.reverse_proxy.vhosts
+          if machine.config.reverse_proxy.vhosts
+            vhosts = machine.config.reverse_proxy.vhosts
           else
             host = machine.config.vm.hostname || machine.name
             vhosts = {host => host}
@@ -95,20 +106,6 @@ EOF
           "# END #{m.id} #"
         end
 
-        # Machine-finding code stolen from vagrant-hostmanager :)
-        def get_machines()
-          # Collect only machines that exist for the current provider
-          @global_env.active_machines.collect do |name, provider|
-            if provider == @provider
-              begin
-                @global_env.machine(name, @provider)
-              rescue Vagrant::Errors::MachineNotFound
-                nil #ignore
-              end
-            end
-          end.compact
-        end
-
         # Also from vagrant-hostmanager
         def get_ip_address(machine)
           ip = nil

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

@@ -2,12 +2,13 @@ module VagrantPlugins
   module ReverseProxy
     class Plugin
       class Config < Vagrant.plugin(2, :config)
-        attr_accessor :enabled, :vhosts
+        attr_accessor :enabled, :vhosts, :nginx_config_file
         alias_method :enabled?, :enabled
 
         def initialize
           @enabled = UNSET_VALUE
           @vhosts = UNSET_VALUE
+          @nginx_config_file = UNSET_VALUE
         end
 
         def finalize!
@@ -29,6 +30,9 @@ module VagrantPlugins
               end
             end
           end
+          if @nginx_config_file == UNSET_VALUE
+            @nginx_config_file = nil
+          end
         end
 
         def validate(machine)
@@ -61,6 +65,10 @@ module VagrantPlugins
             errors << 'vhosts must be an array of hostnames, a string=>string hash or nil'
           end
 
+          unless @nginx_config_file.instance_of?(String) || @nginx_config_file == nil || @nginx_config_file == UNSET_VALUE
+            errors << 'nginx_config_file must be a string'
+          end
+
           { 'Reverse proxy configuration' => errors.compact }
         end
       end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ReverseProxy
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-reverse-proxy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Peter Bex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler