Merge commit '3c88b19dd33b4da1f37e2c08c981ccbcbe5a45a8'.

Conflicts:
	manifests/init.pp

diff --cc manifests/init.pp
index 28fea9986c48a17ca66157523b3e1757c3a8c17e,ea187f34057e540d43a9d7e2650736d24ba46225..54b4fe4d30366e5263388d37c239ce61cc70cb48
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -5,62 -5,6 +5,56 @@@
  
  class apt {
  
-   # See README
-   $real_apt_clean = $apt_clean ? {
-     '' => 'auto',
-     default => $apt_clean,
-   }
- 
 +  $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://ftp.debian.org/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 {
 +    'debian': {
 +      $repos = $apt_repos ? {
 +        ''      => 'main contrib non-free',
 +        default => "${apt_repos}",
 +      }
 +    }
 +    'ubuntu': {
 +      $repos = $apt_repos ? {
 +        ''      => 'main restricted universe multiverse',
 +        default => "${apt_repos}",
 +      }
 +    }
 +  }
 +
    package { apt:
      ensure => installed,
      require => undef,