Merge remote-tracking branch 'riseup/immerda_27_readme' into shared

Conflicts:
	README
	manifests/cron/dist_upgrade.pp
	manifests/cron/download.pp
	manifests/init.pp
	manifests/preferences.pp

11 files changed, 94 insertions, 188 deletions

diff --git a/manifests/apticron.pp b/manifests/apticron.pp
index 2fe8e44..ebdd5b5 100644
--- a/manifests/apticron.pp
+++ b/manifests/apticron.pp
@@ -1,53 +1,21 @@
-class apt::apticron {
-
-  case $apticron_ensure_version {
-    '': { $apticron_ensure_version = "present" }
-  }
-
-  case $apticron_config {
-    '': { $apticron_config = "apt/${operatingsystem}/apticron_${lsbdistcodename}.erb" }
-  }
-
-  case $apticron_email {
-    '': { $apticron_email = "root" }
-  }
-
-  case $apticron_diff_only {
-    '': { $apticron_diff_only = "1" }
-  }
-
-  case $apticron_listchanges_profile {
-    '': { $apticron_listchanges_profile = "apticron" }
-  }
-
-  case $apticron_system {
-    '': { $apticron_system = false }
-  }
-
-  case $apticron_ipaddressnum {
-    '': { $apticron_ipaddressnum = false }
-  }
-
-  case $apticron_ipaddresses {
-    '': { $apticron_ipaddresses = false }
-  }
-
-  case $apticron_notifyholds {
-    '': { $apticron_notifyholds = "0" }
-  }
-
-  case $apticron_notifynew {
-    '': { $apticron_notifynew = "0" }
-  }
-
-  case $apticron_customsubject {
-    '': { $apticron_customsubject = "" }
-  }
-  
-  package { apticron: ensure => $apticron_ensure_version }
+class apt::apticron(
+  $ensure_version = 'installed',
+  $config = "apt/${::operatingsystem}/apticron_${::lsbdistcodename}.erb",
+  $email = 'root',
+  $diff_only = '1',
+  $listchanges_profile = 'apticron',
+  $system = false,
+  $ipaddressnum = false,
+  $ipaddresses = false,
+  $notifyholds = '0',
+  $notifynew = '0',
+  $customsubject = ''
+) {
+
+  package { apticron: ensure => $ensure_version }
 
   file { "/etc/apticron/apticron.conf":
-    content => template($apticron_config),
+    content => template($apt::apticron::config),
     mode => 0644, owner => root, group => root,
     require => Package["apticron"];  
   }
diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp
index bd29784..68460f2 100644
--- a/manifests/cron/dist_upgrade.pp
+++ b/manifests/cron/dist_upgrade.pp
@@ -10,15 +10,16 @@ dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-conf
 
   package { "apt-listbugs": ensure => absent }
 
-  file {
-    "/etc/cron-apt/action.d/4-dist-upgrade":
-      content => $action,
-      mode => 0644, owner => root, group => 0,
-      require => Package[cron-apt];
-    "/etc/cron-apt/config.d/MAILON":
-      content => "MAILON=upgrade\n",
-      mode => 0644, owner => root, group => 0,
-      require => Package[cron-apt];
+  file { "/etc/cron-apt/action.d/4-dist-upgrade":
+    content => $action,
+    require => Package[cron-apt],
+    owner => root, group => 0, mode => 0644;
+  }
+
+  file { "/etc/cron-apt/config.d/MAILON":
+    content => "MAILON=upgrade\n",
+    require => Package[cron-apt],
+    owner => root, group => 0, mode => 0644;
   }
 
 }
diff --git a/manifests/cron/download.pp b/manifests/cron/download.pp
index 5c2d3f9..f4e9184 100644
--- a/manifests/cron/download.pp
+++ b/manifests/cron/download.pp
@@ -8,15 +8,16 @@ dist-upgrade -d -y -o APT::Get::Show-Upgraded=true
     ensure => absent,
   }
 
-  file {
-    "/etc/cron-apt/action.d/3-download":
-      content => $action,
-      mode => 0644, owner => root, group => 0,
-      require => Package[cron-apt];
-    "/etc/cron-apt/config.d/MAILON":
-      content => "MAILON=changes\n",
-      mode => 0644, owner => root, group => 0,
-      require => Package[cron-apt];
+  file { "/etc/cron-apt/action.d/3-download":
+    content => $action,
+    require => Package[cron-apt],
+    owner => root, group => 0, mode => 0644;
+  }
+
+  file { "/etc/cron-apt/config.d/MAILON":
+    content => "MAILON=changes\n",
+    require => Package[cron-apt],
+    owner => root, group => 0, mode => 0644;
   }
 
 }
diff --git a/manifests/dist_upgrade/initiator.pp b/manifests/dist_upgrade/initiator.pp
index 571cd51..f1d522b 100644
--- a/manifests/dist_upgrade/initiator.pp
+++ b/manifests/dist_upgrade/initiator.pp
@@ -10,7 +10,7 @@ class apt::dist_upgrade::initiator inherits apt::dist_upgrade {
     path     => "${initiator_abs}",
     checksum => md5,
     source   => [
-                 "puppet:///modules/site_apt/${fqdn}/${initiator}",
+                 "puppet:///modules/site_apt/${::fqdn}/${initiator}",
                  "puppet:///modules/site_apt/${initiator}",
                  "puppet:///modules/apt/${initiator}",
                 ],
diff --git a/manifests/init.pp b/manifests/init.pp
index 3df48c3..c098ef3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,59 +3,31 @@
 # 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://http.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}",
-  }
-  $disable_update = $apt_disable_update ? {
-    ''      => false,
-    default => $apt_disable_update  
-  }
-
-  case $operatingsystem {
+class apt(
+  $codename = '',
+  $use_volatile = false,
+  $include_src = false,
+  $use_next_release = false,
+  $debian_url = 'http://http.debian.net/debian/',
+  $security_url = 'http://security.debian.org/',
+  $backports_url = 'http://backports.debian.org/debian-backports/',
+  $volatile_url = 'http://volatile.debian.org/debian-volatile/',
+  $ubuntu_url = 'http://archive.ubuntu.com/ubuntu',
+  $repos = 'auto',
+  $custom_preferences = '',
+  $disable_update = false
+){
+  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,
       }
     }
   }
@@ -68,16 +40,15 @@ class apt {
   include lsb
 
   # init $release, $next_release, $codename, $next_codename, $release_version
-  case $lsbdistcodename {
+  case $codename {
     '': {
-      $codename = $lsbdistcodename
-      $release = $lsbdistrelease
+      $codename = $::lsbdistcodename
+      $release = $::lsbdistrelease
     }
     'n/a': {
       fail("Unknown lsbdistcodename reported by facter: '$lsbdistcodename', please fix this by setting this variable in your manifest.")
-    } 
+    }
     default: {
-      $codename = $lsbdistcodename
       $release = debian_release($codename)
     }
   }
@@ -90,23 +61,24 @@ 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
       },
       mode => 0644, owner => root, group => 0,
       require => Package['lsb'],
       notify => Exec['refresh_apt'],
+      owner => root, group => 0, mode => 0644;
   }
 
   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";
@@ -114,7 +86,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" ]
     }
@@ -131,13 +103,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
diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp
index 038d5c9..4194463 100644
--- a/manifests/listchanges.pp
+++ b/manifests/listchanges.pp
@@ -1,37 +1,16 @@
-class apt::listchanges {
-
-  case $apt_listchanges_version {
-    '': { $apt_listchanges_version = "present" }
-  }
-
-  case $apt_listchanges_config {
-    '': { $apt_listchanges_config = "apt/${operatingsystem}/listchanges_${lsbdistcodename}.erb" }
-  }
-
-  case $apt_listchanges_frontend {
-    '': { $apt_listchanges_frontend = "mail" }
-  }
-
-  case $apt_listchanges_email {
-    '': { $apt_listchanges_email = "root" }
-  }
-
-  case $apt_listchanges_confirm {
-    '': { $apt_listchanges_confirm = "0" }
-  }
-
-  case $apt_listchanges_saveseen {
-    '': { $apt_listchanges_saveseen = "/var/lib/apt/listchanges.db" }
-  }
-
-  case $apt_listchanges_which {
-    '': { $apt_listchanges_which = "both" }
-  }
-
-  package { apt-listchanges: ensure => $apt_listchanges_ensure_version }
+class apt::listchanges(
+  $ensure_version = 'installed',
+  $config = "apt/${::operatingsystem}/listchanges_${::lsbdistcodename}.erb",
+  $frontend = 'mail',
+  $email = 'root',
+  $confirm = '0',
+  $saveseen = '/var/lib/apt/listchanges.db',
+  $which = 'both'
+){
+  package { apt-listchanges: ensure => $ensure_version }
   
   file { "/etc/apt/listchanges.conf":
-    content => template($apt_listchanges_config),
+    content => template($apt::listchanges::config),
     mode => 0644, owner => root, group => root,
     require => Package["apt-listchanges"];
   }
diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index f766819..66f36a7 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -2,8 +2,8 @@ class apt::preferences {
 
   $pref_contents = $custom_preferences ? {
     '' => $operatingsystem ? {
-      'debian' => template("apt/${operatingsystem}/preferences_${codename}.erb"),
-      'ubuntu' => template("apt/${operatingsystem}/preferences_${codename}.erb"),
+      'debian' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
+      'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
     },
     default => $custom_preferences
   }
diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index d831934..ac9a821 100644
--- a/manifests/preseeded_package.pp
+++ b/manifests/preseeded_package.pp
@@ -1,12 +1,11 @@
 define apt::preseeded_package ($content = "", $ensure = "installed") {
-  $seedfile = "/var/cache/local/preseeding/$name.seeds"
-  $real_content = $content ? { 
-    ""      => template ( "site_apt/$lsbdistcodename/$name.seeds" ),
-    default => $content
-  }   
+  $seedfile = "/var/cache/local/preseeding/${name}.seeds"
 
   file { $seedfile:
-    content => $real_content,
+    content => $content ? { 
+      ""      => template ( "site_apt/${::lsbdistcodename}/${name}.seeds" ),
+      default => $content
+    },   
     mode => 0600, owner => root, group => root,
   }   
 
diff --git a/manifests/proxy_client.pp b/manifests/proxy_client.pp
index 23e9bd1..c284c74 100644
--- a/manifests/proxy_client.pp
+++ b/manifests/proxy_client.pp
@@ -1,14 +1,7 @@
-class apt::proxy_client {
-
-  $real_apt_proxy = $apt_proxy ? {
-    "" => "http://localhost",
-    default => $apt_proxy
-  }
-
-  $real_apt_proxy_port = $apt_proxy_port ? {
-    "" => "3142",
-    default => $apt_proxy_port
-  }
+class apt::proxy_client(
+  $proxy = 'http://localhost',
+  $port = '3142',
+){
 
   apt_conf { "20proxy":
     content => template("apt/20proxy.erb"),
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index 34d4d31..b5bf829 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -6,10 +6,10 @@ class apt::unattended_upgrades {
   }
 
   apt_conf { "50unattended-upgrades":
-    source  => ["puppet:///modules/site_apt/$lsbdistcodename/50unattended-upgrades",
-		"puppet:///modules/site_apt/50unattended-upgrades",
-		"puppet:///modules/apt/$lsbdistcodename/50unattended-upgrades",
-		"puppet:///modules/apt/50unattended-upgrades" ],
+    source  => [
+      "puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
+  		"puppet:///modules/site_apt/50unattended-upgrades",
+	  	"puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades" ],
     require => Package['unattended-upgrades'],
   }
 
diff --git a/manifests/update.pp b/manifests/update.pp
index ae992f4..9c773ab 100644
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -3,7 +3,7 @@ class apt::update {
   exec { 'update_apt':
     command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
     require => [ File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
-                 Config_file['/etc/apt/sources.list'] ],
+                 File['/etc/apt/sources.list'] ],
     loglevel => info,
     # Another Semaphor for all packages to reference
     alias => "apt_updated"