Update manifests/init.pp
authorScott Barber <scottwbarber@gmail.com>
Thu, 1 Nov 2012 20:33:31 +0000 (14:33 -0600)
committerKen Barber <ken@bob.sh>
Sun, 2 Jun 2013 17:51:27 +0000 (18:51 +0100)
manifests/init.pp

index ad1b4466d0efea66dcb7af7ab16a1dfc72bd0bd2..23197719500809e6b4d1e5c4b4aa5ad87fdf7feb 100644 (file)
@@ -99,18 +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'],
-    }
-  } else {
-    file { 'configure-apt-proxy':
-      path    => "${apt_conf_d}/proxy",
-      ensure  => absent,
-      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.