1 files changed, 20 insertions, 111 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 4bf126c..26afaeb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,64 +3,30 @@
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
 # See LICENSE for the full license granted to you.
 
-class apt(
-  $use_lts = $apt::params::use_lts,
-  $use_volatile = $apt::params::use_volatile,
-  $use_backports = $apt::params::use_backports,
-  $include_src = $apt::params::include_src,
-  $use_next_release = $apt::params::use_next_release,
-  $debian_url = $apt::params::debian_url,
-  $security_url = $apt::params::security_url,
-  $lts_url = $apt::params::lts_url,
-  $volatile_url = $apt::params::volatile_url,
-  $ubuntu_url = $apt::params::ubuntu_url,
-  $repos = $apt::params::repos,
-  $custom_preferences = $apt::params::custom_preferences,
+class apt (
+  $use_lts             = $apt::params::use_lts,
+  $use_volatile        = $apt::params::use_volatile,
+  $use_backports       = $apt::params::use_backports,
+  $include_src         = $apt::params::include_src,
+  $use_next_release    = $apt::params::use_next_release,
+  $debian_url          = $apt::params::debian_url,
+  $security_url        = $apt::params::security_url,
+  $lts_url             = $apt::params::lts_url,
+  $volatile_url        = $apt::params::volatile_url,
+  $ubuntu_url          = $apt::params::ubuntu_url,
+  $repos               = $apt::params::repos,
+  $custom_preferences  = $apt::params::custom_preferences,
   $custom_sources_list = '',
-  $custom_key_dir = $apt::params::custom_key_dir
+  $custom_key_dir      = $apt::params::custom_key_dir,
 ) inherits apt::params {
 
-  package { 'apt':
-    ensure  => installed,
-    require => undef,
-  }
-
-  $sources_content = $custom_sources_list ? {
-    ''      => template( "apt/${::operatingsystem}/sources.list.erb"),
-    default => $custom_sources_list
-  }
-  file {
-    # include main and security
-    # additional sources should be included via the apt::sources_list define
-    '/etc/apt/sources.list':
-      content => $sources_content,
-      notify  => Exec['apt_updated'],
-      owner   => root,
-      group   => 0,
-      mode    => '0644';
-  }
-
-  apt_conf { '02show_upgraded':
-    source => [ "puppet:///modules/site_apt/${::fqdn}/02show_upgraded",
-                'puppet:///modules/site_apt/02show_upgraded',
-                'puppet:///modules/apt/02show_upgraded' ]
-  }
+  include apt::dot_d_directories
+  include apt::config
+  include apt::install
 
-  if ( $::virtual == 'vserver' ) {
-    apt_conf { '03clean_vserver':
-      source => [ "puppet:///modules/site_apt/${::fqdn}/03clean_vserver",
-                  'puppet:///modules/site_apt/03clean_vserver',
-                  'puppet:///modules/apt/03clean_vserver' ],
-      alias => '03clean';
-    }
-  }
-  else {
-    apt_conf { '03clean':
-      source => [ "puppet:///modules/site_apt/${::fqdn}/03clean",
-                  'puppet:///modules/site_apt/03clean',
-                  'puppet:///modules/apt/03clean' ]
-    }
-  }
+  include common::moduledir
+  common::module_dir { 'apt': }
+  $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
 
   case $custom_preferences {
     false: {
@@ -70,61 +36,4 @@ class apt(
       include apt::preferences
     }
   }
-
-  include apt::dot_d_directories
-
-  ## This package should really always be current
-  package { 'debian-archive-keyring': ensure => latest }
-
-  if ($use_backports and !($::debian_release in ['testing', 'unstable', 'experimental'])) {
-    apt::sources_list {
-      'backports':
-        content => "deb ${debian_url} ${::debian_codename}-backports ${apt::repos}",
-    }
-    if $include_src {
-      apt::sources_list {
-        'backports-src':
-          content => "deb-src ${debian_url} ${::debian_codename}-backports ${apt::repos}",
-      }
-    }
-  }
-
-  include common::moduledir
-  common::module_dir { 'apt': }
-  $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
-
-  if $custom_key_dir {
-    file { "${apt_base_dir}/keys.d":
-      source  => $custom_key_dir,
-      recurse => true,
-      owner   => root,
-      group   => root,
-      mode    => '0755',
-    }
-    exec { 'custom_keys':
-      command     => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\;",
-      subscribe   => File["${apt_base_dir}/keys.d"],
-      refreshonly => true,
-      notify      => Exec[refresh_apt]
-    }
-    if $custom_preferences != false {
-      Exec['custom_keys'] {
-        before => File['apt_config']
-      }
-    }
-  }
-
-  # workaround for preseeded_package component
-  file { [ '/var/cache', '/var/cache/local', '/var/cache/local/preseeding' ]: ensure => directory }
-
-  exec { 'update_apt':
-    command     => '/usr/bin/apt-get update',
-    require     => [
-      File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
-      File['/etc/apt/sources.list'] ],
-    refreshonly => true,
-    # Another Semaphor for all packages to reference
-    alias       => [ 'apt_updated', 'refresh_apt']
-  }
-
 }