vagrant-proxyconf 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535eb21da37db3d2eebc8a1f785ae2df92159587
-  data.tar.gz: 09ed302efc15a97f3cee9f2eb89e657d055d40ad
+  metadata.gz: fab817ae04277d81b46ac3d3a524347a75d5ec7b
+  data.tar.gz: 8600468a7b7f912dca91810e2bddab0fc026fbc0
 SHA512:
-  metadata.gz: b050cb3414bf569dc1938b0cdf631beb2285d00c560621cc93a2a8515240ca2c047e44e74103c1524bfba5e138159cb19a269c4a2f4f63fdea4b4869165152e4
-  data.tar.gz: aea65b32cade44afe71f626c81e8efa7aa165bd2a3a534d47b62b23576fdc52e34b8bf33fc106a8a9996758c06bd9a9126a82ac66a3351d17f88f3174ad53db3
+  metadata.gz: d3c28090c36f9e0510d75a8b5200b85603d99831d99362ddb11dcd78eea73ba8ee916691641453c1cda2cd207d1cc96be36b29b1de21126c08640f1d179418d8
+  data.tar.gz: e7a8e0903824e9c43015287de451c0b451051f553825a4b3056a9d5a61ba5f9043394f95e85e5b96be4661b316b3211e8827826309d2ef0c66e658994e134854

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.3.1 / 2014-05-09
+
+Improvements:
+
+  - Write environment variable configuration also to /etc/environment on Linux ([GH-58][], [GH-67][])
+    * Fixes compatibility with vagrant-omnibus and non-login shells
+
 # 1.3.0 / 2014-05-02
 
 Features:
@@ -151,7 +158,9 @@ Bug fixes:
 [GH-50]: https://github.com/tmatilai/vagrant-proxyconf/issues/50 "Issue 50"
 [GH-51]: https://github.com/tmatilai/vagrant-proxyconf/issues/51 "Issue 51"
 [GH-57]: https://github.com/tmatilai/vagrant-proxyconf/issues/57 "Issue 57"
+[GH-58]: https://github.com/tmatilai/vagrant-proxyconf/issues/58 "Issue 58"
 [GH-59]: https://github.com/tmatilai/vagrant-proxyconf/issues/59 "Issue 59"
 [GH-60]: https://github.com/tmatilai/vagrant-proxyconf/issues/60 "Issue 60"
 [GH-62]: https://github.com/tmatilai/vagrant-proxyconf/issues/62 "Issue 62"
 [GH-63]: https://github.com/tmatilai/vagrant-proxyconf/issues/63 "Issue 63"
+[GH-67]: https://github.com/tmatilai/vagrant-proxyconf/issues/67 "Issue 67"

data/Gemfile

@@ -1,10 +1,8 @@
 source 'https://rubygems.org'
 
-gemspec
-
 gem 'vagrant',
   git: 'https://github.com/mitchellh/vagrant.git',
-  ref: ENV.fetch('VAGRANT_VERSION', 'v1.4.3')
+  ref: ENV.fetch('VAGRANT_VERSION', 'v1.5.4')
 
 gem 'cane', '~> 2.6'
 gem 'coveralls', require: false
@@ -17,3 +15,7 @@ group :development do
   gem 'redcarpet'
   gem 'yard', '~> 0.8'
 end
+
+group :plugins do
+  gem 'vagrant-proxyconf', path: '.'
+end

data/README.md

@@ -75,7 +75,7 @@ It is a good practise to wrap plugin specific configuration with `Vagrant.has_pl
 
 It's a common case that you want all possible connections to pass through the same proxy. This will set the default values for all other proxy configuration keys. It also sets default proxy configuration for all Chef Solo and Chef Client provisioners.
 
-Many programs (wget, curl, yum, etc.) can be configured to use proxies with `http_proxy` or `HTTP_PROXY` etc. environment variables. This configuration will be written to _/etc/profile.d/proxy.sh_ on the guest.
+Many programs (wget, curl, yum, etc.) can be configured to use proxies with `http_proxy` or `HTTP_PROXY` etc. environment variables. This configuration will be written to _/etc/profile.d/proxy.sh_ and _/etc/environment_ on the guest.
 
 Also sudo will be configured to preserve the variables. This requires that sudo in the VM is configured to support "sudoers.d", i.e. _/etc/sudoers_ contains line `#includedir /etc/sudoers.d`.
 

data/lib/vagrant-proxyconf/action/configure_env_proxy.rb

@@ -19,6 +19,7 @@ module VagrantPlugins
             logger.info('Writing the proxy configuration to files')
             super
             write_config(sudo_config, path: '/etc/sudoers.d/proxy', mode: '0440')
+            write_environment_config
           end
         end
 
@@ -29,13 +30,6 @@ module VagrantPlugins
           set_windows_proxy('no_proxy', config.no_proxy)
         end
 
-        def sudo_config
-          <<-CONFIG.gsub(/^\s+/, '')
-            Defaults env_keep += "HTTP_PROXY HTTPS_PROXY FTP_PROXY NO_PROXY"
-            Defaults env_keep += "http_proxy https_proxy ftp_proxy no_proxy"
-          CONFIG
-        end
-
         def set_windows_proxy(key, value)
           if value
             command = "cmd.exe /c SETX #{key} #{value.inspect} /M"
@@ -50,6 +44,58 @@ module VagrantPlugins
           @machine.config.vm.guest.eql?(:windows)
         end
 
+        def sudo_config
+          <<-CONFIG.gsub(/^\s+/, '')
+            Defaults env_keep += "HTTP_PROXY HTTPS_PROXY FTP_PROXY NO_PROXY"
+            Defaults env_keep += "http_proxy https_proxy ftp_proxy no_proxy"
+          CONFIG
+        end
+
+        def write_environment_config
+          tmp = "/tmp/vagrant-proxyconf"
+          path = "/etc/environment"
+
+          sed_script = environment_sed_script
+          local_tmp = tempfile(environment_config)
+
+          @machine.communicate.tap do |comm|
+            comm.sudo("rm #{tmp}", error_check: false)
+            comm.upload(local_tmp.path, tmp)
+            comm.sudo("touch #{path}")
+            comm.sudo("sed -e '#{sed_script}' #{path} > #{path}.new")
+            comm.sudo("cat #{tmp} >> #{path}.new")
+            comm.sudo("chmod 0644 #{path}.new")
+            comm.sudo("chown root:root #{path}.new")
+            comm.sudo("mv #{path}.new #{path}")
+            comm.sudo("rm #{tmp}")
+          end
+        end
+
+        def environment_sed_script
+          <<-SED.gsub(/^\s+/, '')
+            /^HTTP_PROXY=/ d
+            /^HTTPS_PROXY=/ d
+            /^FTP_PROXY=/ d
+            /^NO_PROXY=/ d
+            /^http_proxy=/ d
+            /^https_proxy=/ d
+            /^ftp_proxy=/ d
+            /^no_proxy=/ d
+          SED
+        end
+
+        def environment_config
+          <<-CONFIG.gsub(/^\s+/, '')
+            HTTP_PROXY=#{config.http}
+            HTTPS_PROXY=#{config.https}
+            FTP_PROXY=#{config.ftp}
+            NO_PROXY=#{config.no_proxy}
+            http_proxy=#{config.http}
+            https_proxy=#{config.https}
+            ftp_proxy=#{config.ftp}
+            no_proxy=#{config.no_proxy}
+          CONFIG
+        end
       end
     end
   end

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email: