From ee567ecff0bca6ae38b9b9c04e2f929908bc6cfc Mon Sep 17 00:00:00 2001 From: John Bencic Date: Sun, 21 Jun 2015 09:06:30 +1000 Subject: [PATCH 1/2] Fixed bug for passing an array to the bypass-list and updated README --- README.md | 2 +- lib/puppet/provider/winhttp_proxy/netsh.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3969166..e7dce5a 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ winhttp_proxy { 'proxy': winhttp_proxy { 'proxy': proxy_server => 'http=proxy.example.com;https=proxy.example.org', - bypass_list => ';*.example.org;*.example.com' + bypass_list => ['', '*.example.org', '*.example.com'] } ``` diff --git a/lib/puppet/provider/winhttp_proxy/netsh.rb b/lib/puppet/provider/winhttp_proxy/netsh.rb index cb890d3..8c5a5e7 100644 --- a/lib/puppet/provider/winhttp_proxy/netsh.rb +++ b/lib/puppet/provider/winhttp_proxy/netsh.rb @@ -91,7 +91,7 @@ def destroy end def flush - cmd = [ 'cmd.exe', '/c', command(:netsh), 'winhttp', 'set', 'proxy', 'proxy-server="%s"' % @property_hash[:proxy_server], 'bypass-list="%s"' % @property_hash[:bypass_list] ] + cmd = [ 'cmd.exe', '/c', command(:netsh), 'winhttp', 'set', 'proxy', 'proxy-server="%s"' % @property_hash[:proxy_server], 'bypass-list="%s"' % @property_hash[:bypass_list].join(";") ] if Puppet::PUPPETVERSION.to_f < 3.4 raw, status = Puppet::Util::SUIDManager.run_and_capture(cmd) else From c8d4ac4930c5eb4ead9db9035c1574c929bfb090 Mon Sep 17 00:00:00 2001 From: John Bencic Date: Thu, 12 May 2016 07:44:22 +1000 Subject: [PATCH 2/2] Updated bypass_list in flush to handle joining an array --- lib/puppet/provider/winhttp_proxy/netsh.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/winhttp_proxy/netsh.rb b/lib/puppet/provider/winhttp_proxy/netsh.rb index 8c5a5e7..ada7093 100644 --- a/lib/puppet/provider/winhttp_proxy/netsh.rb +++ b/lib/puppet/provider/winhttp_proxy/netsh.rb @@ -91,7 +91,7 @@ def destroy end def flush - cmd = [ 'cmd.exe', '/c', command(:netsh), 'winhttp', 'set', 'proxy', 'proxy-server="%s"' % @property_hash[:proxy_server], 'bypass-list="%s"' % @property_hash[:bypass_list].join(";") ] + cmd = [ 'cmd.exe', '/c', command(:netsh), 'winhttp', 'set', 'proxy', 'proxy-server="%s"' % @property_hash[:proxy_server], 'bypass-list="%s"' % @property_hash[:bypass_list].respond_to?('join') ? @property_hash[:bypass_list].join(";") : @property_hash[:bypass_list] ] if Puppet::PUPPETVERSION.to_f < 3.4 raw, status = Puppet::Util::SUIDManager.run_and_capture(cmd) else