1 files changed, 27 insertions, 59 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 2ae691f..4a4b178 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,54 +3,29 @@
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
 # See LICENSE for the full license granted to you.
 
-class apt {
-
-  $use_volatile = $apt_volatile_enabled ? {
-    ''      => false,
-    default => $apt_volatile_enabled,
-  }
-
-  $include_src = $apt_include_src ? {
-    ''      => false,
-    default => $apt_include_src,
-  }
-
-  $use_next_release = $apt_use_next_release ? {
-    ''      => false,
-    default => $apt_use_next_release,
-  }
-
-  $debian_url = $apt_debian_url ? {
-    ''      => 'http://cdn.debian.net/debian/',
-    default => "${apt_debian_url}",
-  }
-  $security_url = $apt_security_url ? {
-    ''      => 'http://security.debian.org/',
-    default => "${apt_security_url}",
-  }
-  $backports_url = $apt_backports_url ? {
-    ''      => 'http://backports.debian.org/debian-backports/',
-    default => "${apt_backports_url}",
-  }
-  $volatile_url = $apt_volatile_url ? {
-    ''      => 'http://volatile.debian.org/debian-volatile/',
-    default => "${apt_volatile_url}",
-  }
-  $ubuntu_url = $apt_ubuntu_url ? {
-    ''      => 'http://archive.ubuntu.com/ubuntu',
-    default => "${apt_ubuntu_url}",
-  }
-  case $operatingsystem {
+class apt(
+  $use_volatile = hiera('apt_volatile_enabled',false),
+  $include_src = hiera('apt_include_src',false),
+  $use_next_release = hiera('apt_use_next_release'),
+  $debian_url = hiera('apt_debian_url','http://cdn.debian.net/debian/'),
+  $security_url = hiera('apt_security_url','http://security.debian.org/'),
+  $backports_url = hiera('apt_backports_url','http://backports.debian.org/debian-backports/'),
+  $volatile_url = hiera('apt_volatile_url', 'http://volatile.debian.org/debian-volatile/'),
+  $ubuntu_url = hiera('apt_ubuntu_url', 'http://archive.ubuntu.com/ubuntu'),
+  $repos = hiera('apt_repos','auto'),
+  $custom_preferences = hiera('apt_custom_preferences','')
+) {
+  case $::operatingsystem {
     'debian': {
-      $repos = $apt_repos ? {
-        ''      => 'main contrib non-free',
-        default => "${apt_repos}",
+      $real_repos = $repos ? {
+        'auto'      => 'main contrib non-free',
+        default => $repos,
       }
     }
     'ubuntu': {
-      $repos = $apt_repos ? {
+      $real_repos = $repos ? {
         ''      => 'main restricted universe multiverse',
-        default => "${apt_repos}",
+        default => $repos,
       }
     }
   }
@@ -63,13 +38,13 @@ class apt {
   include lsb
 
   # init $release, $next_release, $codename, $next_codename, $release_version
-  case $lsbdistcodename {
+  case $::lsbdistcodename {
     '': {
-      $codename = $lsbdistcodename
-      $release = $lsbdistrelease
+      $codename = $::lsbdistcodename
+      $release = $::lsbdistrelease
     }
     default: {
-      $codename = $lsbdistcodename
+      $codename = $::lsbdistcodename
       $release = debian_release($codename)
     }
   }
@@ -82,7 +57,7 @@ class apt {
     # additional sources should be included via the apt::sources_list define
     "/etc/apt/sources.list":
       content => $custom_sources_list ? {
-        '' => template( "apt/$operatingsystem/sources.list.erb"),
+        '' => template( "apt/${::operatingsystem}/sources.list.erb"),
         default => $custom_sources_list
       },
       require => Package['lsb'],
@@ -90,14 +65,14 @@ class apt {
   }
 
   apt_conf { "02show_upgraded":
-    source => [ "puppet:///modules/site_apt/${fqdn}/02show_upgraded",
+    source => [ "puppet:///modules/site_apt/${::fqdn}/02show_upgraded",
                 "puppet:///modules/site_apt/02show_upgraded",
                 "puppet:///modules/apt/02show_upgraded" ]
   }
 
-  if ( $virtual == "vserver" ) {
+  if ( $::virtual == "vserver" ) {
     apt_conf { "03clean_vserver":
-      source => [ "puppet:///modules/site_apt/${fqdn}/03clean_vserver",
+      source => [ "puppet:///modules/site_apt/${::fqdn}/03clean_vserver",
                   "puppet:///modules/site_apt/03clean_vserver",
                   "puppet:///modules/apt/03clean_vserver" ],
       alias => "03clean";
@@ -105,7 +80,7 @@ class apt {
   }
   else {
     apt_conf { "03clean":
-      source => [ "puppet:///modules/site_apt/${fqdn}/03clean",
+      source => [ "puppet:///modules/site_apt/${::fqdn}/03clean",
                   "puppet:///modules/site_apt/03clean",
                   "puppet:///modules/apt/03clean" ]
     }
@@ -122,13 +97,6 @@ class apt {
     }
   }
 
-  # backward compatibility: upgrade from previous versions of this module.
-  file {
-    [ "/etc/apt/apt.conf.d/from_puppet", "/etc/apt/apt.conf.d/99from_puppet" ]:
-      ensure  => 'absent',
-      require => [ Apt_conf['02show_upgraded'], Apt_conf['03clean'] ];
-  }
-
   include apt::dot_d_directories
 
   ## This package should really always be current