Merge commit 'ac76a5d52df78aec919f08334ca5b140902a9298'

(Starting to merge changes from immerda.)

Conflicts:
	manifests/default_sources_list.pp
	manifests/init.pp

diff --cc manifests/init.pp
index cdcd142ff6bbac9b06679275d5342d3efe4b87eb,0e4bd5ccac4e181b04893e1bbbb14ba427f403f9..f55507f533e87c8a9bd800a6767419bb8e33b267
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -68,24 -18,17 +68,32 @@@ class apt 
      require => undef,
    }
  
-       include lsb
+   include lsb
++
 +  # init $release, $next_release, $codename, $next_codename
 +  case $lsbdistcodename {
 +    '': {
 +      $codename = $lsbdistcodename
 +      $release = $lsbdistrelease
 +    }
 +    default: {
 +      $codename = $lsbdistcodename
 +      $release = debian_release($codename)
 +    }
 +  }
 +  $next_codename = debian_nextcodename($codename)
 +  $next_release = debian_nextrelease($release)
 +
    case $custom_sources_list {
      '': {
-       include apt::default_sources_list
+       config_file {
+         # include main, security and backports
+         # additional sources should be included via the custom_sources_template
+         # define
+         "/etc/apt/sources.list":
+           content => template( "apt/$operatingsystem/sources.list.erb"),
+           require => Package['lsb'];
+       }
      }
      default: {
        config_file { "/etc/apt/sources.list":
@@@ -94,6 -38,19 +102,18 @@@
      }
    }
  
 -  # 01autoremove already present by default
+   apt_conf_snippet{ "02show_upgraded":
+     source => ["puppet:///modules/site-apt/${fqdn}/02show_upgraded",
+                "puppet:///modules/site-apt/02show_upgraded",
+                "puppet:///modules/apt/02show_upgraded"]
+   }
+ 
+   apt_conf_snippet{ "03clean":
+     source => ["puppet:///modules/site-apt/${fqdn}/03clean",
+                "puppet:///modules/site-apt/03clean",
+                "puppet:///modules/apt/03clean"]
+   }
+ 
    case $custom_preferences {
      false: {
        include apt::preferences::absent
@@@ -103,29 -60,6 +123,17 @@@
      }
    }
  
-   config_file { '/etc/apt/apt.conf.d/99from_puppet': }
-   # little default settings which keep the system sane
-   append_if_no_such_line { 'apt-get-show-upgraded':
-     file    => "/etc/apt/apt.conf.d/99from_puppet",
-     line    => "APT::Get::Show-Upgraded true;",
-     before  => Concatenated_file['/etc/apt/preferences'],
-     require => Config_file['/etc/apt/apt.conf.d/99from_puppet'],
-   }
-   append_if_no_such_line { 'dselect-clean':
-     file    => "/etc/apt/apt.conf.d/99from_puppet",
-     line    => "DSelect::Clean ${real_apt_clean};",
-     before  => Concatenated_file['/etc/apt/preferences'],
-     require => Config_file['/etc/apt/apt.conf.d/99from_puppet'],
-   }
 +  # backward compatibility: upgrade from previous versions of this module.
 +  file {
-     "/etc/apt/apt.conf.d/from_puppet":
++    ["/etc/apt/apt.conf.d/from_puppet",
++     "/etc/apt/apt.conf.d/99from_puppet"
++    ]:
 +      ensure  => 'absent',
-       require => [ Append_if_no_such_line['apt-get-show-upgraded'],
-                    Append_if_no_such_line['dselect-clean']
++      require => [ Apt_conf_snippet['02show_upgraded'],
++                   Apt_conf_snippet['03clean'],
 +                 ],
 +  }
 +
    if $apt_unattended_upgrades {
      include apt::unattended_upgrades
    }