vagrant-proxyconf 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89c3334da0f5ca851a92f23dc388327d47dee03a
-  data.tar.gz: 743404cd2300188be2c8fccf0dda4894b2ba8523
+SHA256:
+  metadata.gz: 0f389b148d8815b5a0f81a851900dbea47114c3f6b60597107d7815eb6ab0fa9
+  data.tar.gz: b3f551cedfd75ebb27d06d495b4bffee2e5832a1b45dec1065933b999939ef13
 SHA512:
-  metadata.gz: 2298453a51c191d77e4b927ac5be44d4d15aff00fce6a14a4c532dfb85587f7686966ae374f538583fb3ece529724990e902be06af337979f54b0cf3af5c70af
-  data.tar.gz: 375908939f9f242efcd9d4e3b41a610017be5b9e55680d4e09b71620561f55750d0de9508b257c7c8c271881835f28703d3ecfb6113bdbd9922ffd6f14bec728
+  metadata.gz: d8a521ab63ab244683f2027ae6dc5902f9f8ff9b08514f3099ff0fcfd9e3f1105a1518fdd924f2fcb57ca53a131a5510cb877eeaefd28b3bef47eab00fe265e6
+  data.tar.gz: 4cd46b6a73344a8d1ee2fe045d2c398c172298d6fa0c2fbda69785e76999d1748072bbf3cc832433494921b9d27dc19644125414198746cf0e236713f3ac06af

data/.travis.yml

@@ -12,6 +12,8 @@ env:
 rvm: 2.4.4
 matrix:
   include:
+    - env: VAGRANT_VERSION=v2.2.4
+    - env: VAGRANT_VERSION=v2.2.3
     - env: VAGRANT_VERSION=v2.2.2
     - env: VAGRANT_VERSION=v2.1.5
     - env: VAGRANT_VERSION=v2.0.4

data/Gemfile

@@ -18,8 +18,8 @@ end
 #### End Added due to https://groups.google.com/forum/#!topic/vagrant-up/J8J6LmhzBqM/discussion
 
 gem 'vagrant',
-    git: 'https://github.com/mitchellh/vagrant.git',
-    ref: ENV.fetch('VAGRANT_VERSION', 'v2.2.2')
+    git: 'https://github.com/hashicorp/vagrant.git',
+    ref: ENV.fetch('VAGRANT_VERSION', 'v2.2.4')
 
 gem 'rake'
 gem 'rspec', '~> 3.1'
@@ -27,6 +27,7 @@ gem 'rspec-its', '~> 1.0'
 
 group :development do
   gem 'guard-rspec'
+  gem 'mini_portile2'
   gem 'pry'
   gem 'rb-readline'
   gem 'redcarpet'

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

@@ -20,6 +20,7 @@ module VagrantPlugins
           detect_export
           write_docker_config
           update_docker_client_config
+          update_docker_systemd_config
 
           true
         end
@@ -33,6 +34,7 @@ module VagrantPlugins
 
           write_docker_config
           update_docker_client_config
+          update_docker_systemd_config
 
           true
         end
@@ -109,6 +111,64 @@ module VagrantPlugins
           config_json
         end
 
+        def update_docker_systemd_config
+          return if !supports_systemd?
+          changed = false
+
+          if disabled?
+            @machine.communicate.tap do |comm|
+              changed = true if comm.test('[ -f /etc/systemd/system/docker.service.d/http-proxy.conf ]')
+              changed = true if comm.test('[ -f /etc/systemd/system/docker.service.d/https-proxy.conf ]')
+
+              comm.sudo('rm -f /etc/systemd/system/docker.service.d/http-proxy.conf')
+              comm.sudo('rm -f /etc/systemd/system/docker.service.d/https-proxy.conf')
+              comm.sudo('systemctl daemon-reload')
+
+              if changed
+                comm.sudo("systemctl restart #{docker}")
+              end
+
+            end
+
+            changed = true
+            return changed
+          end
+
+          systemd_config = docker_systemd_config
+          @docker_systemd_config = tempfile(systemd_config).path
+
+          @machine.communicate.tap do |comm|
+
+            comm.sudo("mkdir -p /etc/systemd/system/docker.service.d")
+            comm.upload(@docker_systemd_config, "/tmp/vagrant-proxyconf-docker-systemd-config")
+
+            if comm.test("diff -Naur /etc/systemd/system/docker.service.d/http-proxy.conf /tmp/vagrant-proxyconf-docker-systemd-config")
+              # system config file is the same as the current config
+
+              changed = false
+            else
+              # system config file is not the same as the current config
+
+              comm.sudo("mv /tmp/vagrant-proxyconf-docker-systemd-config /etc/systemd/system/docker.service.d/http-proxy.conf")
+              changed = true
+            end
+
+            comm.sudo('chown -R 0:0 /etc/systemd/system/docker.service.d/')
+            comm.sudo('chmod 0644 /etc/systemd/system/docker.service.d/http-proxy.conf')
+
+            if changed
+              # there were changes so restart docker
+
+              comm.sudo('systemctl daemon-reload')
+              comm.sudo("systemctl restart #{docker}")
+            end
+
+          end
+
+          changed
+
+        end
+
         def docker
           if config_path && config_path.include?('docker.io')
             'docker.io'
@@ -143,6 +203,14 @@ module VagrantPlugins
           return false
         end
 
+        def supports_systemd?
+
+          @machine.communicate.tap do |comm|
+            comm.test('command -v systemctl') ? true : false
+          end
+
+        end
+
         def write_docker_config
           tmp = "/tmp/vagrant-proxyconf"
           path = config_path
@@ -173,7 +241,7 @@ module VagrantPlugins
 
         def detect_export
           @machine.communicate.tap do |comm|
-            comm.test('command -v systemctl') ? @export = '' : @export = 'export '
+            supports_systemd? ? @export = '' : @export = 'export '
           end
         end
 
@@ -207,6 +275,23 @@ module VagrantPlugins
             #{@export}no_proxy=\"#{config.no_proxy || ''}\"
           CONFIG
         end
+
+        def docker_systemd_config
+          return if disabled?
+
+          environment = []
+          environment << 'Environment="HTTP_PROXY='  + config.http     + '"' if config.http
+          environment << 'Environment="HTTPS_PROXY=' + config.https    + '"' if config.https
+          environment << 'Environment="NO_PROXY='    + config.no_proxy + '"' if config.no_proxy
+
+          return if !environment.any?
+
+          <<-SYSTEMD.gsub(/^\s+/, '')
+            [Service]
+            #{environment.join("\n")}
+          SYSTEMD
+        end
+
       end
     end
   end

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
   end
 end

data/spec/unit/vagrant-proxyconf/action/configure_docker_proxy_spec.rb

@@ -27,6 +27,8 @@ def mock_update_docker_client_config(machine)
   allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /etc/docker")
 end
 
+def mock_update_docker_systemd_config(machine)
+end
 
 describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
 
@@ -93,6 +95,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
 
         # update_docker_client_config mock
         allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
+        allow(docker_proxy).to receive(:supports_systemd?).and_return(false)
 
         @docker_proxy = docker_proxy
       end
@@ -101,14 +104,80 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
         before :each do
           fixture = fixture_file("docker_client_config_json_enabled_proxy")
           configure_docker_proxy(fixture)
+          allow(machine).to receive_message_chain(:communicate, :sudo).with(
+            "sed -e '/^export HTTP_PROXY=/ d\n/^export http_proxy=/ d\n/^export HTTPS_PROXY=/ d\n/^export https_proxy=/ d\n/^export NO_PROXY=/ d\n/^export no_proxy=/ d\n' /etc/default/docker > /etc/default/docker.new"
+          )
         end
 
         it 'update /etc/docker/config.json' do
-          allow(machine).to receive_message_chain(:communicate, :test).with('command -v systemctl').and_return('')
+            expect(@docker_proxy.send(:configure_machine)).to eq true
+        end
+      end
+
+      context 'and when configuring systemd' do
+        let(:app) { OpenStruct.new }
+        let(:env) { OpenStruct.new }
+        let(:machine) { double('machine') }
+
+        def configure_docker_proxy(fixture)
+          docker_proxy = described_class.new(app, env)
+          docker_proxy.instance_variable_set(:@machine, machine)
+
+          # #docker_client_config_path mock
+          fixture = docker_proxy.send(:tempfile, load_fixture(fixture)).path
+          docker_proxy.instance_variable_set(:@docker_client_config_path, fixture)
+
+          # #supported? mock
+          allow(machine).to receive_message_chain(:guest, :capability?).with(:docker_proxy_conf).and_return(true)
+          allow(machine).to receive_message_chain(:guest, :capability).with(:docker_proxy_conf).and_return('/etc/default/docker')
+
+          # #config mock
+          config = create_config_proxy(
+            :enabled  => true,
+            :http     => 'http://proxy-server-01.example.com:8080',
+            :https    => 'https://proxy-server-01.example.com:8080',
+            :no_proxy => 'localhost',
+          )
+
+          allow(machine).to receive_message_chain(:config, :proxy).and_return(config)
+          allow(machine).to receive_message_chain(:config, :public_send).with(:docker_proxy).and_return(config)
+          allow(machine).to receive_message_chain(:communicate, :test).with('command -v systemctl').and_return(true)
+
+          mock_write_docker_config(machine)
+          mock_update_docker_client_config(machine)
+
+          @docker_proxy = docker_proxy
+        end
+
+        context 'when directory: /etc/systemd/system/docker.service.d does not exist' do
+
+          before :each do
+            fixture = fixture_file("docker_client_config_json_enabled_proxy")
+            configure_docker_proxy(fixture)
+
+            # update_docker_client_config mock
+            allow(@docker_proxy).to receive(:supports_config_json?).and_return(false)
+            allow(@docker_proxy).to receive(:supports_systemd?).and_return(true)
+
+            # systemd_config mocking
+            allow(machine).to receive_message_chain(:communicate, :sudo).with("mkdir -p /etc/systemd/system/docker.service.d")
+            allow(machine).to receive_message_chain(:communicate, :upload).with(@docker_proxy.instance_variable_get(:@docker_systemd_config), "/tmp")
+            allow(machine).to receive_message_chain(:communicate, :sudo).with('chown -R 0:0 /etc/systemd/system/docker.service.d/')
+            allow(machine).to receive_message_chain(:communicate, :sudo).with('chmod 0644 /etc/systemd/system/docker.service.d/http-proxy.conf')
+            allow(machine).to receive_message_chain(:communicate, :test).with('command -v systemctl').and_return(false)
+            allow(machine).to receive_message_chain(:communicate, :test).with('diff -Naur /etc/systemd/system/docker.service.d/http-proxy.conf /tmp/vagrant-proxyconf-docker-systemd-config').and_return(false)
+            allow(machine).to receive_message_chain(:communicate, :sudo).with('mv /tmp/vagrant-proxyconf-docker-systemd-config /etc/systemd/system/docker.service.d/http-proxy.conf')
+            allow(machine).to receive_message_chain(:communicate, :sudo).with('systemctl daemon-reload')
+            allow(machine).to receive_message_chain(:communicate, :sudo).with('systemctl restart docker')
+          end
+
+          it 'should create directory: /etc/systemd/system/docker.service.d' do
+            expect(@docker_proxy.send(:update_docker_systemd_config)).to eq true
+          end
 
-          expect(@docker_proxy.send(:configure_machine)).to eq true
         end
       end
+
     end
   end
 
@@ -323,6 +392,9 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           config_path = docker_proxy.send(:tempfile, load_fixture(fixture)).path
           docker_proxy.instance_variable_set(:@docker_client_config_path, config_path)
 
+          # to isolate this test, we turn of support for systemd
+          allow(docker_proxy).to receive(:supports_systemd?).and_return(false)
+
           allow(machine).to receive_message_chain(:guest, :capability?).with(:docker_proxy_conf).and_return(true)
           allow(machine).to receive_message_chain(:guest, :capability).with(:docker_proxy_conf).and_return('/etc/default/docker')
 
@@ -337,6 +409,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           allow(machine).to receive_message_chain(:config, :proxy).and_return(config)
           allow(machine).to receive_message_chain(:config, :public_send).with(:docker_proxy).and_return(config)
 
+
           # mock write_docker_config
           mock_write_docker_config(machine)
 
@@ -361,6 +434,9 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           docker_proxy.instance_variable_set(:@machine, machine)
           docker_proxy.instance_variable_set(:@version, [18, 9, 0])
 
+          # to isolate this test, we turn of support for systemd
+          allow(docker_proxy).to receive(:supports_systemd?).and_return(false)
+
           fixture = fixture_file("docker_client_config_json_enabled_proxy")
           config_path = docker_proxy.send(:tempfile, load_fixture(fixture)).path
           docker_proxy.instance_variable_set(:@docker_client_config_path, config_path)

data/test/issues/172/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/test/issues/172/Dockerfile

@@ -0,0 +1,47 @@
+FROM centos:7
+
+ENV CI_USERNAME vagrant
+ENV CI_PASSWORD vagrant
+ENV CI_HOMEDIR  /home/vagrant
+ENV CI_SHELL    /bin/bash
+
+EXPOSE 8888
+
+RUN yum clean all && \
+    yum makecache fast && \
+    yum -y install epel-release && \
+    yum clean expire-cache && \
+    yum -y install \
+      curl \
+      initscripts \
+      openssh-clients \
+      openssh-server \
+      sudo \
+      tinyproxy
+
+RUN /usr/sbin/sshd-keygen && \
+    mkdir -p /var/run/sshd && \
+    rm -f /usr/lib/tmpfiles.d/systemd-nologin.conf
+
+RUN if ! getent passwd $CI_USERNAME; then \
+      useradd -m -d ${CI_HOMEDIR} -s ${CI_SHELL} $CI_USERNAME; \
+    fi && \
+    echo "${CI_USERNAME}:${CI_PASSWORD}" | chpasswd && \
+    echo "${CI_USERNAME} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \
+    mkdir -p /etc/sudoers.d && \
+    echo "${CI_USERNAME} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/${CI_USERNAME} && \
+    chmod 0440 /etc/sudoers.d/${CI_USERNAME} && \
+    mkdir -p ${CI_HOMEDIR}/.ssh && \
+    chown -R ${CI_USERNAME}:${CI_USERNAME} ${CI_HOMEDIR}/.ssh && \
+    chmod 0700 ${CI_HOMEDIR}/.ssh && \
+    curl -L https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub > ${CI_HOMEDIR}/.ssh/vagrant.pub && \
+    touch ${CI_HOMEDIR}/.ssh/authorized_keys && \
+    grep -q "$(cat ${CI_HOMEDIR}/.ssh/vagrant.pub | awk '{print $2}')" ${CI_HOMEDIR}/.ssh/authorized_keys || cat ${CI_HOMEDIR}/.ssh/vagrant.pub >> ${CI_HOMEDIR}/.ssh/authorized_keys && \
+    chown ${CI_USERNAME}:${CI_USERNAME} ${CI_HOMEDIR}/.ssh/authorized_keys && \
+    chmod 0600 ${CI_HOMEDIR}/.ssh/authorized_keys
+
+COPY tinyproxy.conf /etc/tinyproxy/tinyproxy.conf
+COPY entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD [ "start" ]

data/test/issues/172/README.md

@@ -0,0 +1,31 @@
+Tests
+-----
+
+If you are testing the current release of this plugin via bundler
+
+```
+bundle exec vagrant up default
+```
+
+## Expect
+
+
+### Box `default``
+
+  - The box `default` is a docker container that will be a reverse
+    proxy. It should provision itself and work without errors.
+
+  - You can check that the proxy is working by
+    `tail -f /var/log/tinyproxy/tinyproxy.log` inside the container
+
+  - **NOTE**: You'll need to use `docker exec <hash> -it bash` to get into the container
+
+
+### Box `docker-host`
+
+  - Vagrant should automatically instally docker-ce.
+  - The box should come up and provision itself with the proxy settings
+    configured in your Vagrantfile.
+
+
+  - **NOTE**: You can use `ssh` to connect to this container.

data/test/issues/172/Rakefile

@@ -0,0 +1,27 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+task :spec    => 'spec:all'
+task :default => :spec
+
+namespace :spec do
+  targets = []
+  Dir.glob('./spec/*').each do |dir|
+    next unless File.directory?(dir)
+    target = File.basename(dir)
+    target = "_#{target}" if target == "default"
+    targets << target
+  end
+
+  task :all     => targets
+  task :default => :all
+
+  targets.each do |target|
+    original_target = target == "_default" ? target[1..-1] : target
+    desc "Run serverspec tests to #{original_target}"
+    RSpec::Core::RakeTask.new(target.to_sym) do |t|
+      ENV['TARGET_HOST'] = original_target
+      t.pattern = "spec/#{original_target}/*_spec.rb"
+    end
+  end
+end

data/test/issues/172/Vagrantfile

@@ -0,0 +1,48 @@
+# this should be the IP address of the :default box
+$PROXY_HOST ="10.0.2.2"
+$PROXY_PORT="8888"
+$PROXY_NO_PROXY=[
+  'localhost',
+]
+
+ENV['HTTP_PROXY']  = ENV.fetch('HTTP_PROXY',  "http://#{$PROXY_HOST}:#{$PROXY_PORT}")
+ENV['HTTPS_PROXY'] = ENV.fetch('HTTPS_PROXY', "https://#{$PROXY_HOST}:#{$PROXY_PORT}")
+ENV['NO_PROXY']    = ENV.fetch('NO_PROXY',    $PROXY_NO_PROXY.join(","))
+
+puts "HTTP_PROXY  = '#{ENV["HTTP_PROXY"]}'"
+puts "HTTPS_PROXY = '#{ENV["HTTPS_PROXY"]}'"
+puts "NO_PROXY    = '#{ENV["NO_PROXY"]}'"
+
+puts "vagrant-proxyconf is installed? #{Vagrant.has_plugin?('vagrant-proxyconf')}"
+
+
+Vagrant.configure("2") do |config|
+
+  config.vm.define 'default' do |c|
+    c.vm.box = nil
+
+    if Vagrant.has_plugin?('vagrant-proxyconf')
+      c.proxy.enabled = false
+    end
+
+    c.vm.provider "docker" do |d|
+      d.build_dir = "."
+      d.expose = ["#{$PROXY_PORT}"]
+      d.has_ssh = true
+      d.ports = ["#{$PROXY_PORT}", "#{$PROXY_PORT}"].join(':')
+    end
+  end
+
+  config.vm.define 'docker_host' do |c|
+    c.vm.box = "centos/7"
+
+    if Vagrant.has_plugin?('vagrant-proxyconf')
+      c.proxy.http     = ENV['HTTP_PROXY']
+      c.proxy.https    = ENV['HTTPS_PROXY']
+      c.proxy.no_proxy = ENV['NO_PROXY']
+    end
+
+    c.vm.provision "docker"
+  end
+
+end

data/test/issues/172/entrypoint.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+set -ex
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+start() {
+  # start ssh if sshd is installed
+  if [ -f /usr/sbin/sshd ]; then
+
+    /usr/sbin/sshd-keygen
+    /usr/sbin/sshd -t
+    /usr/sbin/sshd
+
+  else
+
+    true
+
+  fi
+
+  # start tinyproxy
+  /usr/sbin/tinyproxy \
+    -d \
+    -c "/etc/tinyproxy/tinyproxy.conf"
+}
+
+stop() {
+
+  pgrep -f 'sshd' | while read _pid
+  do
+    kill -9 $_pid
+  done
+
+  pgrep -f 'tinyproxy' | while read _pid
+  do
+    kill -9 $_pid
+  done
+
+}
+
+case "${1}" in
+
+  start)
+    start
+    ;;
+
+  stop)
+    stop
+    ;;
+
+esac

data/test/issues/172/spec/default/redhat_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe package('tinyproxy') do
+  it { should be_installed }
+end
+
+describe service('tinyproxy') do
+  it { should be_enabled }
+  it { should be_running }
+end
+
+
+describe port(8888) do
+  it { should be_listening }
+end

data/test/issues/172/spec/docker_host/redhat_spec.rb

@@ -0,0 +1,250 @@
+require 'spec_helper'
+
+PROXY_HOST = "10.0.2.2"
+
+describe service('docker') do
+  it { should be_running }
+  it { should be_enabled  }
+end
+
+describe file('/etc/docker/config.json') do
+  it { should be_file }
+  it { should exist }
+  it { should be_mode 600 }
+  it { should be_owned_by "root" }
+  it { should be_grouped_into "root" }
+end
+
+context 'when proxy is enabled' do
+
+  before(:context) do
+    ENV['HTTP_PROXY']  = "http://#{PROXY_HOST}:8888"
+    ENV['HTTPS_PROXY'] = "https://#{PROXY_HOST}:8888"
+    ENV['NO_PROXY']    = "*.example.com"
+
+    `vagrant provision #{ENV['TARGET_HOST']}`
+    `sleep 3`
+  end
+
+  describe file('/etc/docker/config.json') do
+    let(:expected_content) do
+      {
+        "proxies" => {
+          "default" => {
+            "httpProxy"  => "http://10.0.2.2:8888",
+            "httpsProxy" => "https://10.0.2.2:8888",
+            "noProxy"    => "*.example.com",
+          }
+        }
+      }
+    end
+
+    its(:content_as_json) do
+       should include(expected_content)
+    end
+  end
+
+  describe file('/etc/systemd/system/docker.service.d/http-proxy.conf') do
+    let(:expected_content) do
+      <<-CONFIG.gsub(/^\s+/, "")
+        [Service]
+        Environment="HTTP_PROXY=http://10.0.2.2:8888"
+        Environment="HTTPS_PROXY=https://10.0.2.2:8888"
+        Environment="NO_PROXY=*.example.com"
+      CONFIG
+    end
+
+    it { should be_file }
+    it { should exist }
+    it { should be_mode 644 }
+    it { should be_owned_by "root" }
+    it { should be_grouped_into "root" }
+    its(:content) { should include(expected_content) }
+  end
+
+end
+
+context 'when HTTP_PROXY=""' do
+
+  before(:context) do
+    ENV['HTTP_PROXY']  = ""
+    ENV['HTTPS_PROXY'] = "https://#{PROXY_HOST}:8888"
+    ENV['NO_PROXY']    = "*.example.com"
+
+    `vagrant provision #{ENV['TARGET_HOST']}`
+    `sleep 3`
+  end
+
+  describe file('/etc/docker/config.json') do
+    let(:expected_content) do
+      {
+        "proxies" => {
+          "default" => {
+            "httpsProxy" => "https://#{PROXY_HOST}:8888",
+             "noProxy"   => "*.example.com",
+          }
+        }
+      }
+    end
+
+    its(:content_as_json) do
+       should include(expected_content)
+    end
+  end
+
+  describe file('/etc/systemd/system/docker.service.d/http-proxy.conf') do
+    let(:expected_content) do
+      <<-CONFIG.gsub(/^\s+/, "")
+        [Service]
+        Environment="HTTPS_PROXY=https://10.0.2.2:8888"
+        Environment="NO_PROXY=*.example.com"
+      CONFIG
+    end
+
+    it { should be_file }
+    it { should exist }
+    it { should be_mode 644 }
+    it { should be_owned_by "root" }
+    it { should be_grouped_into "root" }
+    its(:content) { should include(expected_content) }
+  end
+
+end
+
+context 'when HTTPS_PROXY=""' do
+
+  before(:context) do
+    ENV['HTTP_PROXY']  = "http://#{PROXY_HOST}:8888"
+    ENV['HTTPS_PROXY'] = ""
+    ENV['NO_PROXY']    = "*.example.com"
+
+    `vagrant provision #{ENV['TARGET_HOST']}`
+  end
+
+  describe file('/etc/docker/config.json') do
+    let(:expected_content) do
+      {
+        "proxies" => {
+          "default" => {
+            "httpProxy"  => "http://#{PROXY_HOST}:8888",
+             "noProxy"   => "*.example.com",
+          }
+        }
+      }
+    end
+
+    its(:content_as_json) do
+       should include(expected_content)
+    end
+  end
+
+  describe file('/etc/systemd/system/docker.service.d/http-proxy.conf') do
+    let(:expected_content) do
+      <<-CONFIG.gsub(/^\s+/, "")
+        [Service]
+        Environment="HTTP_PROXY=http://10.0.2.2:8888"
+        Environment="NO_PROXY=*.example.com"
+      CONFIG
+    end
+
+    it { should be_file }
+    it { should exist }
+    it { should be_mode 644 }
+    it { should be_owned_by "root" }
+    it { should be_grouped_into "root" }
+    its(:content) { should include(expected_content) }
+  end
+
+end
+
+context 'when HTTPS_PROXY="" and HTTP_PROXY=""' do
+
+  before(:context) do
+    ENV['HTTP_PROXY']  = ""
+    ENV['HTTPS_PROXY'] = ""
+    ENV['NO_PROXY']    = "*.example.com"
+
+    `vagrant provision #{ENV['TARGET_HOST']}`
+    `sleep 3`
+  end
+
+  describe file('/etc/docker/config.json') do
+    let(:expected_content) do
+      {
+        "proxies" => {
+          "default" => {
+             "noProxy"   => "*.example.com",
+          }
+        }
+      }
+    end
+
+    its(:content_as_json) do
+       should include(expected_content)
+    end
+  end
+
+  describe file('/etc/systemd/system/docker.service.d/http-proxy.conf') do
+    let(:expected_content) do
+      <<-CONFIG.gsub(/^\s+/, "")
+        [Service]
+        Environment="NO_PROXY=*.example.com"
+      CONFIG
+    end
+
+    it { should be_file }
+    it { should exist }
+    it { should be_mode 644 }
+    it { should be_owned_by "root" }
+    it { should be_grouped_into "root" }
+    its(:content) { should include(expected_content) }
+  end
+
+end
+
+context 'when NO_PROXY=""' do
+
+  before(:context) do
+    ENV['HTTP_PROXY']  = "http://#{PROXY_HOST}:8888"
+    ENV['HTTPS_PROXY'] = "https://#{PROXY_HOST}:8888"
+    ENV['NO_PROXY']    = ""
+
+    `vagrant provision #{ENV['TARGET_HOST']}`
+    `sleep 3`
+  end
+
+  describe file('/etc/docker/config.json') do
+    let(:expected_content) do
+      {
+        "proxies" => {
+          "default" => {
+             "httpProxy"  => "http://#{PROXY_HOST}:8888",
+             "httpsProxy" => "https://#{PROXY_HOST}:8888",
+          }
+        }
+      }
+    end
+
+    its(:content_as_json) do
+       should include(expected_content)
+    end
+  end
+
+  describe file('/etc/systemd/system/docker.service.d/http-proxy.conf') do
+    let(:expected_content) do
+      <<-CONFIG.gsub(/^\s+/, "")
+        [Service]
+        Environment="HTTP_PROXY=http://10.0.2.2:8888"
+        Environment="HTTPS_PROXY=https://10.0.2.2:8888"
+      CONFIG
+    end
+
+    it { should be_file }
+    it { should exist }
+    it { should be_mode 644 }
+    it { should be_owned_by "root" }
+    it { should be_grouped_into "root" }
+    its(:content) { should include(expected_content) }
+  end
+
+end

data/test/issues/172/spec/spec_helper.rb

@@ -0,0 +1,52 @@
+require 'serverspec'
+require 'net/ssh'
+require 'tempfile'
+
+set :backend, :ssh
+
+if ENV['ASK_SUDO_PASSWORD']
+  begin
+    require 'highline/import'
+  rescue LoadError
+    fail "highline is not available. Try installing it."
+  end
+  set :sudo_password, ask("Enter sudo password: ") { |q| q.echo = false }
+else
+  set :sudo_password, ENV['SUDO_PASSWORD'] || "vagrant"
+end
+
+host = ENV['TARGET_HOST']
+
+`vagrant up #{host}`
+
+config = Tempfile.new('', Dir.tmpdir)
+config.write(`vagrant ssh-config #{host}`)
+config.close
+
+options = Net::SSH::Config.for(host, [config.path])
+
+options[:user] ||= Etc.getlogin
+
+set :host,        options[:host_name] || host
+set :ssh_options, options
+
+# Disable sudo
+# set :disable_sudo, true
+
+
+# Set environment variables
+set :env,
+  :LANG => 'C',
+  :LC_MESSAGES => 'C'
+
+# Set PATH
+# set :path, '/sbin:/usr/local/sbin:$PATH'
+set :path, [
+  '/usr/local/bin',
+  '/usr/local/sbin',
+  '/usr/bin',
+  '/usr/sbin',
+  '/bin',
+  '/sbin',
+  '$PATH',
+].join(':')

data/test/issues/172/tinyproxy.conf

@@ -0,0 +1,333 @@
+##
+## tinyproxy.conf -- tinyproxy daemon configuration file
+##
+## This example tinyproxy.conf file contains example settings
+## with explanations in comments. For decriptions of all
+## parameters, see the tinproxy.conf(5) manual page.
+##
+
+#
+# User/Group: This allows you to set the user and group that will be
+# used for tinyproxy after the initial binding to the port has been done
+# as the root user. Either the user or group name or the UID or GID
+# number may be used.
+#
+User tinyproxy
+Group tinyproxy
+
+#
+# Port: Specify the port which tinyproxy will listen on.  Please note
+# that should you choose to run on a port lower than 1024 you will need
+# to start tinyproxy using root.
+#
+Port 8888
+
+#
+# Listen: If you have multiple interfaces this allows you to bind to
+# only one. If this is commented out, tinyproxy will bind to all
+# interfaces present.
+#
+#Listen 192.168.0.1
+
+#
+# Bind: This allows you to specify which interface will be used for
+# outgoing connections.  This is useful for multi-home'd machines where
+# you want all traffic to appear outgoing from one particular interface.
+#
+#Bind 192.168.0.1
+
+#
+# BindSame: If enabled, tinyproxy will bind the outgoing connection to the
+# ip address of the incoming connection.
+#
+#BindSame yes
+
+#
+# Timeout: The maximum number of seconds of inactivity a connection is
+# allowed to have before it is closed by tinyproxy.
+#
+Timeout 600
+
+#
+# ErrorFile: Defines the HTML file to send when a given HTTP error
+# occurs.  You will probably need to customize the location to your
+# particular install.  The usual locations to check are:
+#   /usr/local/share/tinyproxy
+#   /usr/share/tinyproxy
+#   /etc/tinyproxy
+#
+#ErrorFile 404 "/usr/share/tinyproxy/404.html"
+#ErrorFile 400 "/usr/share/tinyproxy/400.html"
+#ErrorFile 503 "/usr/share/tinyproxy/503.html"
+#ErrorFile 403 "/usr/share/tinyproxy/403.html"
+#ErrorFile 408 "/usr/share/tinyproxy/408.html"
+
+#
+# DefaultErrorFile: The HTML file that gets sent if there is no
+# HTML file defined with an ErrorFile keyword for the HTTP error
+# that has occured.
+#
+DefaultErrorFile "/usr/share/tinyproxy/default.html"
+
+#
+# StatHost: This configures the host name or IP address that is treated
+# as the stat host: Whenever a request for this host is received,
+# Tinyproxy will return an internal statistics page instead of
+# forwarding the request to that host.  The default value of StatHost is
+# tinyproxy.stats.
+#
+#StatHost "tinyproxy.stats"
+#
+
+#
+# StatFile: The HTML file that gets sent when a request is made
+# for the stathost.  If this file doesn't exist a basic page is
+# hardcoded in tinyproxy.
+#
+StatFile "/usr/share/tinyproxy/stats.html"
+
+#
+# LogFile: Allows you to specify the location where information should
+# be logged to.  If you would prefer to log to syslog, then disable this
+# and enable the Syslog directive.  These directives are mutually
+# exclusive.
+#
+LogFile "/var/log/tinyproxy/tinyproxy.log"
+
+#
+# Syslog: Tell tinyproxy to use syslog instead of a logfile.  This
+# option must not be enabled if the Logfile directive is being used.
+# These two directives are mutually exclusive.
+#
+#Syslog On
+
+#
+# LogLevel: 
+#
+# Set the logging level. Allowed settings are:
+#	Critical	(least verbose)
+#	Error
+#	Warning
+#	Notice
+#	Connect		(to log connections without Info's noise)
+#	Info		(most verbose)
+#
+# The LogLevel logs from the set level and above. For example, if the
+# LogLevel was set to Warning, then all log messages from Warning to
+# Critical would be output, but Notice and below would be suppressed.
+#
+LogLevel Info
+
+#
+# PidFile: Write the PID of the main tinyproxy thread to this file so it
+# can be used for signalling purposes.
+#
+PidFile "/var/run/tinyproxy/tinyproxy.pid"
+
+#
+# XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which
+# contains the client's IP address.
+#
+#XTinyproxy Yes
+
+#
+# Upstream:
+#
+# Turns on upstream proxy support.
+#
+# The upstream rules allow you to selectively route upstream connections
+# based on the host/domain of the site being accessed.
+#
+# For example:
+#  # connection to test domain goes through testproxy
+#  upstream testproxy:8008 ".test.domain.invalid"
+#  upstream testproxy:8008 ".our_testbed.example.com"
+#  upstream testproxy:8008 "192.168.128.0/255.255.254.0"
+#
+#  # no upstream proxy for internal websites and unqualified hosts
+#  no upstream ".internal.example.com"
+#  no upstream "www.example.com"
+#  no upstream "10.0.0.0/8"
+#  no upstream "192.168.0.0/255.255.254.0"
+#  no upstream "."
+#
+#  # connection to these boxes go through their DMZ firewalls
+#  upstream cust1_firewall:8008 "testbed_for_cust1"
+#  upstream cust2_firewall:8008 "testbed_for_cust2"
+#
+#  # default upstream is internet firewall
+#  upstream firewall.internal.example.com:80
+#
+# The LAST matching rule wins the route decision.  As you can see, you
+# can use a host, or a domain:
+#  name     matches host exactly
+#  .name    matches any host in domain "name"
+#  .        matches any host with no domain (in 'empty' domain)
+#  IP/bits  matches network/mask
+#  IP/mask  matches network/mask
+#
+#Upstream some.remote.proxy:port
+
+#
+# MaxClients: This is the absolute highest number of threads which will
+# be created. In other words, only MaxClients number of clients can be
+# connected at the same time.
+#
+MaxClients 100
+
+#
+# MinSpareServers/MaxSpareServers: These settings set the upper and
+# lower limit for the number of spare servers which should be available.
+#
+# If the number of spare servers falls below MinSpareServers then new
+# server processes will be spawned.  If the number of servers exceeds
+# MaxSpareServers then the extras will be killed off.
+#
+MinSpareServers 5
+MaxSpareServers 20
+
+#
+# StartServers: The number of servers to start initially.
+#
+StartServers 10
+
+#
+# MaxRequestsPerChild: The number of connections a thread will handle
+# before it is killed. In practise this should be set to 0, which
+# disables thread reaping. If you do notice problems with memory
+# leakage, then set this to something like 10000.
+#
+MaxRequestsPerChild 0
+
+#
+# Allow: Customization of authorization controls. If there are any
+# access control keywords then the default action is to DENY. Otherwise,
+# the default action is ALLOW.
+#
+# The order of the controls are important. All incoming connections are
+# tested against the controls based on order.
+#
+Allow 127.0.0.1
+Allow 0.0.0.0/0
+
+#
+# AddHeader: Adds the specified headers to outgoing HTTP requests that
+# Tinyproxy makes. Note that this option will not work for HTTPS
+# traffic, as Tinyproxy has no control over what headers are exchanged.
+#
+#AddHeader "X-My-Header" "Powered by Tinyproxy"
+
+#
+# ViaProxyName: The "Via" header is required by the HTTP RFC, but using
+# the real host name is a security concern.  If the following directive
+# is enabled, the string supplied will be used as the host name in the
+# Via header; otherwise, the server's host name will be used.
+#
+ViaProxyName "tinyproxy"
+
+#
+# DisableViaHeader: When this is set to yes, Tinyproxy does NOT add
+# the Via header to the requests. This virtually puts Tinyproxy into
+# stealth mode. Note that RFC 2616 requires proxies to set the Via
+# header, so by enabling this option, you break compliance.
+# Don't disable the Via header unless you know what you are doing...
+#
+#DisableViaHeader Yes
+
+#
+# Filter: This allows you to specify the location of the filter file.
+#
+#Filter "/etc/tinyproxy/filter"
+
+#
+# FilterURLs: Filter based on URLs rather than domains.
+#
+#FilterURLs On
+
+#
+# FilterExtended: Use POSIX Extended regular expressions rather than
+# basic.
+#
+#FilterExtended On
+
+#
+# FilterCaseSensitive: Use case sensitive regular expressions.
+#
+#FilterCaseSensitive On
+
+#
+# FilterDefaultDeny: Change the default policy of the filtering system.
+# If this directive is commented out, or is set to "No" then the default
+# policy is to allow everything which is not specifically denied by the
+# filter file.
+#
+# However, by setting this directive to "Yes" the default policy becomes
+# to deny everything which is _not_ specifically allowed by the filter
+# file.
+#
+#FilterDefaultDeny Yes
+
+#
+# Anonymous: If an Anonymous keyword is present, then anonymous proxying
+# is enabled.  The headers listed are allowed through, while all others
+# are denied. If no Anonymous keyword is present, then all headers are
+# allowed through.  You must include quotes around the headers.
+#
+# Most sites require cookies to be enabled for them to work correctly, so
+# you will need to allow Cookies through if you access those sites.
+#
+#Anonymous "Host"
+#Anonymous "Authorization"
+#Anonymous "Cookie"
+
+#
+# ConnectPort: This is a list of ports allowed by tinyproxy when the
+# CONNECT method is used.  To disable the CONNECT method altogether, set
+# the value to 0.  If no ConnectPort line is found, all ports are
+# allowed (which is not very secure.)
+#
+# The following two ports are used by SSL.
+#
+ConnectPort 443
+ConnectPort 563
+
+#
+# Configure one or more ReversePath directives to enable reverse proxy
+# support. With reverse proxying it's possible to make a number of
+# sites appear as if they were part of a single site.
+#
+# If you uncomment the following two directives and run tinyproxy
+# on your own computer at port 8888, you can access Google using
+# http://localhost:8888/google/ and Wired News using
+# http://localhost:8888/wired/news/. Neither will actually work
+# until you uncomment ReverseMagic as they use absolute linking.
+#
+#ReversePath "/google/"	"http://www.google.com/"
+#ReversePath "/wired/"	"http://www.wired.com/"
+
+#
+# When using tinyproxy as a reverse proxy, it is STRONGLY recommended
+# that the normal proxy is turned off by uncommenting the next directive.
+#
+#ReverseOnly Yes
+
+#
+# Use a cookie to track reverse proxy mappings. If you need to reverse
+# proxy sites which have absolute links you must uncomment this.
+#
+#ReverseMagic Yes
+
+#
+# The URL that's used to access this reverse proxy. The URL is used to
+# rewrite HTTP redirects so that they won't escape the proxy. If you
+# have a chain of reverse proxies, you'll need to put the outermost
+# URL here (the address which the end user types into his/her browser).
+#
+# If not set then no rewriting occurs.
+#
+#ReverseBaseURL "http://localhost:8888/"
+
+
+
+
+### foo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -138,6 +138,16 @@ files:
 - spec/unit/vagrant-proxyconf/resource_spec.rb
 - spec/unit/vagrant-proxyconf/resources/yum_config_spec.rb
 - spec/unit/vagrant-proxyconf/userinfo_uri_spec.rb
+- test/issues/172/.rspec
+- test/issues/172/Dockerfile
+- test/issues/172/README.md
+- test/issues/172/Rakefile
+- test/issues/172/Vagrantfile
+- test/issues/172/entrypoint.sh
+- test/issues/172/spec/default/redhat_spec.rb
+- test/issues/172/spec/docker_host/redhat_spec.rb
+- test/issues/172/spec/spec_helper.rb
+- test/issues/172/tinyproxy.conf
 - test/issues/180/.rspec
 - test/issues/180/Dockerfile
 - test/issues/180/README.md
@@ -170,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that configures the virtual machine to use proxy servers
@@ -230,6 +240,16 @@ test_files:
 - spec/unit/vagrant-proxyconf/resource_spec.rb
 - spec/unit/vagrant-proxyconf/resources/yum_config_spec.rb
 - spec/unit/vagrant-proxyconf/userinfo_uri_spec.rb
+- test/issues/172/.rspec
+- test/issues/172/Dockerfile
+- test/issues/172/README.md
+- test/issues/172/Rakefile
+- test/issues/172/Vagrantfile
+- test/issues/172/entrypoint.sh
+- test/issues/172/spec/default/redhat_spec.rb
+- test/issues/172/spec/docker_host/redhat_spec.rb
+- test/issues/172/spec/spec_helper.rb
+- test/issues/172/tinyproxy.conf
 - test/issues/180/.rspec
 - test/issues/180/Dockerfile
 - test/issues/180/README.md