Merge branch 'proxy'

* proxy:
  Add spec test for removing proxy configuration.
  Update manifests/init.pp
  Update manifests/init.pp
  Update manifests/init.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index b8e356c53ae8a3aa09b7427a96065189b1389158..23197719500809e6b4d1e5c4b4aa5ad87fdf7feb 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -99,12 +99,16 @@ class apt(
     default: { fail('Valid values for disable_keys are true or false') }
   }
 
-  if ($proxy_host) {
-    file { 'configure-apt-proxy':
-      path    => "${apt_conf_d}/proxy",
-      content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
-      notify  => Exec['apt_update'],
-    }
+  $proxy_set = $proxy_host ? {
+    false   => absent,
+    default => present
+  }
+
+  file { 'configure-apt-proxy':
+    path    => "${apt_conf_d}/proxy",
+    content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
+    notify  => Exec['apt_update'],
+    ensure  => $proxy_set,
   }
 
   # Need anchor to provide containment for dependencies.

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index d623a5bf7824f8c2d32ec0cc6322b9a23f83549f..a66feac78810ce3175580a2dd5ee4b7298fcd2ea 100644 (file)
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -120,7 +120,11 @@ describe 'apt', :type => :class do
               'notify'  => "Exec[apt_update]"
             )
           else
-            should_not contain_file('configure_apt_proxy')
+            should contain_file('configure-apt-proxy').with(
+              'path'    => '/etc/apt/apt.conf.d/proxy',
+              'notify'  => 'Exec[apt_update]',
+              'ensure'  => 'absent'
+            )
           end
         }
       end