vagrant-foodshow 0.0.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2c18e133d54680de1cff45b980bcec79a66bb11
-  data.tar.gz: b87f5cd17a303d0cd5e1f4839bf8c6a1f4e4bb1d
+  metadata.gz: f146d0ff605189d2e409ede395779c9be1d9f282
+  data.tar.gz: 455533e5892334c78b3b900b276f2b53ab502f17
 SHA512:
-  metadata.gz: d278adae5aa813ebb71938f38695de830be8477506d2d22056a8bf016bfd7a0dac98e6c7e26fc786bd69005d1597af7d9cd9cc94a03627258eaf2922691c24c5
-  data.tar.gz: e47a40018a2de86eacd1d0a0066fc5f4381674ec10857668438db91b8040d7e4e6748a4ae890e2eb7cafaab432f4f9e3953e3c6fa6c6e8821cccfa163a396271
+  metadata.gz: 0c8cc0f7499bf6aeda07a578a1ccb03881ca9c268f2aa2f84983f561602c4d2e03e6672ef3435d26ed5474e60e85275f06ba1e7ee347670af3c628064a53b8c0
+  data.tar.gz: 99d663cea9e2df4bc40e453b8c9a3f8612f64091b00759518f4fb00cf0a9c839124fe1b7fe0b720f347e21dde9f6c8ae7121514ed55e6ded60993b6218256834

data/README.md

@@ -101,6 +101,28 @@ Vagrant.configure("2") do |config|
   end
 end
 ```
+
+### Self-hosted tunnel example
+
+```ruby
+Vagrant.configure("2") do |config|
+  #Enable foodshow
+  config.foodshow.enabled = true
+  # Set your ngrokd server
+  config.foodshow.server_addr = "127.0.0.1:4443"
+  # Allow host root certificate
+  config.foodshow.trust_host_root_certs = true
+  ...
+  # Define vm
+  config.vm.define :web01 do |conf|
+    ...
+    #Just add ngrok_proto parameter to your port forwarding entry
+    conf.vm.network :forwarded_port, guest: 80, host: 8080, ngrok_proto: "http+https"
+    ...
+    end
+end
+```
+Read this document if you want to start self-hosted server https://github.com/inconshreveable/ngrok/blob/master/docs/SELFHOSTING.md
 ### Options
 
 - Scope *config* means that this option can be set only via `foodshow.<options>`
@@ -120,6 +142,8 @@ Option | Default | Scope | Purpose
 `host_ip` | `127.0.0.1` | tunnel | Custom destination ip for tunnel
 `inspect_addr` | `127.0.0.1` | config | Address for traffic inspection
 `inspect_pbase` | `4040` | config | Base port for traffic inspection, other ngrok  processes will use the next available port
+`server_addr` | `nil` | config+tunnel | Server address for self-hosted ngrokd, see [Self-hosted tunnels example](#self-hosted-tunnel-example)
+`trust_host_root_certs` | `nil` | config+tunnel | Allow ngrok accept root server certificate. Must be `true` if you using self-hosted ngrokd
 
 # Authors
 

data/lib/vagrant-foodshow/config.rb

@@ -2,6 +2,9 @@ module VagrantPlugins
   module Foodshow
     class Config < Vagrant.plugin(2, :config)
 
+      attr_accessor :server_addr
+      attr_accessor :trust_host_root_certs
+
       attr_accessor :timeout
       attr_accessor :enabled
       attr_accessor :forward_ssh
@@ -30,6 +33,10 @@ module VagrantPlugins
         @hostname     = UNSET_VALUE
         @httpauth     = UNSET_VALUE
         @subdomain    = UNSET_VALUE
+
+        # Options for self-hosted ngrokd
+        @server_addr           = UNSET_VALUE
+        @trust_host_root_certs = UNSET_VALUE
       end
 
       def tunnel(port, proto = "http+https", options={})
@@ -82,6 +89,9 @@ module VagrantPlugins
       def finalize!
         @ngrok_bin = ::File.expand_path('~/bin/ngrok') if @ngrok_bin == UNSET_VALUE
 
+        @trust_host_root_certs = nil if @trust_host_root_certs == UNSET_VALUE
+        @server_addr           = nil if @server_addr           == UNSET_VALUE
+
         @enabled       = false            if @enabled      == UNSET_VALUE
         @forward_ssh   = false            if @forward_ssh  == UNSET_VALUE
         @timeout       = 10               if @timeout      == UNSET_VALUE

data/lib/vagrant-foodshow/util/ngrok.rb

@@ -13,7 +13,11 @@ module VagrantPlugins
             @@counter = 0
           end
 
-          config        = VagrantPlugins::Foodshow::Util::NgrokConfig.merge_config(env, tunnel)
+          config = VagrantPlugins::Foodshow::Util::NgrokConfig.merge_config(env, tunnel)
+
+          trust_host_root_certs = config.delete(:trust_host_root_certs)
+          server_addr           = config.delete(:server_addr)
+
           timeout       = config.delete(:timeout)
           log_file      = config.delete(:log_file)
           pid_file      = config.delete(:pid_file)
@@ -36,6 +40,14 @@ module VagrantPlugins
 
             conf_h.write("inspect_addr: #{inspect_addr.to_s}:#{inspect_pbase.to_i + @@counter}\n")
 
+            if server_addr
+              conf_h.write("server_addr: #{server_addr}\n")
+            end
+
+            if trust_host_root_certs == true
+              conf_h.write("trust_host_root_certs: true\n")
+            end
+
             if authtoken
               conf_h.write("auth_token: #{authtoken}\n")
             end

data/lib/vagrant-foodshow/util/ngrok_config.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
   module Foodshow
     module Util
       class NgrokConfig
-        NGROK_ALLOWED_OPTIONS = %w(authtoken hostname httpauth proto subdomain host port)
+        NGROK_ALLOWED_OPTIONS = %w(authtoken hostname httpauth proto subdomain host port server_addr trust_host_root_certs)
 
         def self.build_cmd(config)
           cmd  = config.delete(:ngrok_bin) + " -log=stdout"
@@ -28,6 +28,9 @@ module VagrantPlugins
           config = {}
           foodshow_config = env[:machine].config.foodshow
 
+          config[:trust_host_root_certs] = foodshow_config.trust_host_root_certs if foodshow_config.trust_host_root_certs
+          config[:server_addr]           = foodshow_config.server_addr           if foodshow_config.server_addr
+
           config[:ngrok_bin]     = foodshow_config.ngrok_bin     if foodshow_config.ngrok_bin
           config[:timeout]       = foodshow_config.timeout       if foodshow_config.timeout
 

data/lib/vagrant-foodshow/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Foodshow
-    VERSION = "0.0.8"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-foodshow
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Nikita Borzykh