Prepare metadata for supported module release.

[puppet-modules/puppetlabs-apt.git] / manifests / init.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index 517391535a931cf1ee6c3c39f03f8020341e6c3c..1c3f902ada5c9f9c953e908581c31a5483113959 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -134,15 +134,21 @@ Package: bogus-package\n",
     default => present
   }
 
-  file { 'configure-apt-proxy':
+  file { '01proxy':
     ensure  => $proxy_set,
-    path    => "${apt_conf_d}/proxy",
+    path    => "${apt_conf_d}/01proxy",
     content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
     notify  => Exec['apt_update'],
     mode    => '0644',
     owner   => root,
     group   => root,
   }
+  
+  file { 'old-proxy-file':
+    ensure  => absent,
+    path    => "${apt_conf_d}/proxy",
+    notify  => Exec['apt_update'],
+  }
 
   # Need anchor to provide containment for dependencies.
   anchor { 'apt::update':
@@ -151,7 +157,7 @@ Package: bogus-package\n",
 
   # manage sources if present
   if $sources != undef {
-   validate_hash($sources)
-   create_resources('apt::source', $sources)
+    validate_hash($sources)
+    create_resources('apt::source', $sources)
   }
 }