refactor to fit pbp

- refactor every class and define into its very own file to fit
  better (at least our) puppet's best practices.

- some cosmetic rearrangements

- no code changes have been made, only reordering

1 files changed, 118 insertions, 199 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index f8d7e4a..d6a8fb7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,204 +5,123 @@
 
 class apt {
 
-	# See README
-	$real_apt_clean = $apt_clean ? {
-		'' => 'auto',
-		default => $apt_clean,
-	}
-
-	package { apt: ensure => installed }
-
-	# a few templates need lsbdistcodename
-	include assert_lsbdistcodename
-
-	case $custom_sources_list {
-		'': {
-			include default_sources_list
-		}
-		default: {
-			config_file { "/etc/apt/sources.list":
-				content => $custom_sources_list,
-				require => Exec[assert_lsbdistcodename];
-			}
-		}
-	}
-
-	class default_sources_list {
-		config_file {
-			# include main, security and backports
-			# additional sources could be included via an array
-			"/etc/apt/sources.list":
-				content => template("apt/sources.list.erb"),
-				require => Exec[assert_lsbdistcodename];
-		}
-	}
-
-        case $custom_preferences {
-          '': {
-            include default_preferences
-          }
-          default: {
-            config_file { "/etc/apt/preferences":
-              content => $custom_preferences,
-              alias => apt_config,
-              require => File["/etc/apt/sources.list"];
-            }
-          }
-        }
-        class default_preferences {
-	  config_file {
-	    # this just pins unstable and testing to very low values
-	    "/etc/apt/preferences":
-	      content => template("apt/preferences.erb"),
-	      # use File[apt_config] to reference a completed configuration
-	      # See "The Puppet Semaphor" 2007-06-25 on the puppet-users ML
-	      alias => apt_config,
-	      # only update together
-	      require => File["/etc/apt/sources.list"];
-	    # little default settings which keep the system sane
-	    "/etc/apt/apt.conf.d/from_puppet":
-	      content => "APT::Get::Show-Upgraded true;\nDSelect::Clean $real_apt_clean;\n",
-	      before => File[apt_config];
-	  }
-        }
+  # See README
+  $real_apt_clean = $apt_clean ? {
+    '' => 'auto',
+    default => $apt_clean,
+  }
+
+  package { apt: ensure => installed }
+
+  # a few templates need lsbdistcodename
+  include assert_lsbdistcodename
+
+  case $custom_sources_list {
+    '': {
+      include apt::default_sources_list
+    }
+    default: {
+      config_file { "/etc/apt/sources.list":
+        content => $custom_sources_list,
+        require => Exec[assert_lsbdistcodename];
+      }
+    }
+  }
+
+  case $custom_preferences {
+    '': {
+      include apt::default_preferences
+    }
+    default: {
+      config_file { "/etc/apt/preferences":
+        content => $custom_preferences,
+        alias => apt_config,
+        require => File["/etc/apt/sources.list"];
+      }
+    }
+  }
 
   $apt_base_dir = "${module_dir_path}/apt"
-	module_dir { apt: }
-	# watch apt.conf.d
-	file { "/etc/apt/apt.conf.d": ensure => directory, checksum => mtime; }
-
-	exec {
-		# "&& sleep 1" is workaround for older(?) clients
-		"/usr/bin/apt-get update && sleep 1 #on refresh":
-			refreshonly => true,
-			subscribe => [ File["/etc/apt/sources.list"],
-				File["/etc/apt/preferences"], File["/etc/apt/apt.conf.d"],
-				File[apt_config] ];
-		"/usr/bin/apt-get update && /usr/bin/apt-get autoclean #hourly":
-			require => [ File["/etc/apt/sources.list"],
-				File["/etc/apt/preferences"], File[apt_config] ],
-			# Another Semaphor for all packages to reference
-			alias => apt_updated;
-	}
-
-        ## This package should really always be current
-        package { "debian-archive-keyring":
-          ensure => latest,
-        }
-          
-	case $lsbdistcodename {
-		etch: {
-		  package { "debian-backports-keyring":
-		    ensure => latest,
-		  }
-                  
-		  # This key was downloaded from
-		  # http://backports.org/debian/archive.key
-		  # and is needed to bootstrap the backports trustpath
-		  file { "${apt_base_dir}/backports.org.key":
-		    source => "puppet://$servername/apt/backports.org.key",
-		    mode => 0444, owner => root, group => root,
-		  }
-		  exec { "/usr/bin/apt-key add ${apt_base_dir}/backports.org.key && apt-get update":
-		    alias => "backports_key",
-		    refreshonly => true,
-		    subscribe => File["${apt_base_dir}/backports.org.key"],
-		    before => [ File[apt_config], Package["debian-backports-keyring"] ]
-		  }
-		}
-                lenny: {
-                  package { "debian-backports-keyring":
-                    ensure => latest,
-                  }
-
-                  # This key was downloaded from
-                  # http://backports.org/debian/archive.key
-                  # and is needed to bootstrap the backports trustpath
-                  file { "${apt_base_dir}/backports.org.key":
-                    source => "puppet://$servername/apt/backports.org.key",
-                    mode => 0444, owner => root, group => root,
-                  }
-                  exec { "/usr/bin/apt-key add ${apt_base_dir}/backports.org.key && apt-get update":
-                    alias => "backports_key",
-                    refreshonly => true,
-                    subscribe => File["${apt_base_dir}/backports.org.key"],
-                    before => [ File[apt_config], Package["debian-backports-keyring"] ]
-                  }
-                }
-	}
-
-        case $custom_key_dir {
-          '': {
-            exec { "/bin/true # no_custom_keydir": }
-          }
-          default: {
-            file { "${apt_base_dir}/keys.d":
-              source => "$custom_key_dir",
-              recurse => true,
-              mode => 0755, owner => root, group => root,
-            }
-            exec { "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && apt-get update":
-              alias => "custom_keys",
-              subscribe => File["${apt_base_dir}/keys.d"],
-              refreshonly => true,
-              before => File[apt_config];
-            }
-          }
-        }
-
-        # workaround for preseeded_package component
-        file { "/var/cache": ensure => directory }
-        file { "/var/cache/local": ensure => directory }
-        file { "/var/cache/local/preseeding/": ensure => directory }
-
-        define preseeded_package ($content = "", $ensure = "installed") {
-          $seedfile = "/var/cache/local/preseeding/$name.seeds"
-          $real_content = $content ? {
-            "" => template ( "$debian_version/$name.seeds" ),
-            Default => $content
-          }
-  
-          file{ $seedfile:
-            content => $real_content,
-            mode => 0600, owner => root, group => root,
-          }
-  
-          package { $name:
-            ensure => $ensure,
-            responsefile => $seedfile,
-            require => File[$seedfile],
-          }
-        }
-
-        define upgrade_package ($version = "") {
-          case $version { 
-            '': { 
-              exec { "aptitude -y install $name": 
-                onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
-              }
-            }
-            'latest': { 
-              exec { "aptitude -y install $name": 
-                onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
-              }
-            }
-            default: { 
-              exec { "aptitude -y install $name=$version": 
-                onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
-              } 
-            }
-          }
-        }
-}       
-
-class dselect {
-	# suppress annoying help texts of dselect
-	line { dselect_expert:
-		file => "/etc/dpkg/dselect.cfg",
-		line => "expert",
-		ensure => present,
-	}
-
-	package { dselect: ensure => installed }
-}
+  module_dir { apt: }
+  # watch apt.conf.d
+  file { "/etc/apt/apt.conf.d": ensure => directory, checksum => mtime; }
+
+  exec {
+    # "&& sleep 1" is workaround for older(?) clients
+    "/usr/bin/apt-get update && sleep 1 #on refresh":
+      refreshonly => true,
+      subscribe => [ File["/etc/apt/sources.list"],
+                     File["/etc/apt/preferences"], 
+                     File["/etc/apt/apt.conf.d"],
+                     File[apt_config] ];
+      "/usr/bin/apt-get update && /usr/bin/apt-get autoclean #hourly":
+        require => [ File["/etc/apt/sources.list"],
+                     File["/etc/apt/preferences"], File[apt_config] ],
+        # Another Semaphor for all packages to reference
+        alias => apt_updated;
+  }
+
+  ## This package should really always be current
+  package { "debian-archive-keyring": ensure => latest }
+        
+  case $lsbdistcodename {
+    etch: {
+      package { "debian-backports-keyring": ensure => latest }
+                
+      # This key was downloaded from
+      # http://backports.org/debian/archive.key
+      # and is needed to bootstrap the backports trustpath
+      file { "${apt_base_dir}/backports.org.key":
+        source => "puppet://$servername/apt/backports.org.key",
+        mode => 0444, owner => root, group => root,
+      }
+      exec { "/usr/bin/apt-key add ${apt_base_dir}/backports.org.key && apt-get update":
+        alias => "backports_key",
+        refreshonly => true,
+        subscribe => File["${apt_base_dir}/backports.org.key"],
+        before => [ File[apt_config], Package["debian-backports-keyring"] ]
+      }
+    }
+    lenny: {
+      package { "debian-backports-keyring": ensure => latest }
+
+      # This key was downloaded from
+      # http://backports.org/debian/archive.key
+      # and is needed to bootstrap the backports trustpath
+      file { "${apt_base_dir}/backports.org.key":
+        source => "puppet://$servername/apt/backports.org.key",
+        mode => 0444, owner => root, group => root,
+      }
+      exec { "/usr/bin/apt-key add ${apt_base_dir}/backports.org.key && apt-get update":
+        alias => "backports_key",
+        refreshonly => true,
+        subscribe => File["${apt_base_dir}/backports.org.key"],
+        before => [ File[apt_config], Package["debian-backports-keyring"] ]
+      }
+    }
+  }
+
+  case $custom_key_dir {
+    '': {
+      exec { "/bin/true # no_custom_keydir": }
+    }
+    default: {
+      file { "${apt_base_dir}/keys.d":
+        source => "$custom_key_dir",
+        recurse => true,
+        mode => 0755, owner => root, group => root,
+      }
+      exec { "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && apt-get update":
+        alias => "custom_keys",
+        subscribe => File["${apt_base_dir}/keys.d"],
+        refreshonly => true,
+        before => File[apt_config];
+      }
+    }
+  }
+
+  # workaround for preseeded_package component
+  file { "/var/cache": ensure => directory }
+  file { "/var/cache/local": ensure => directory }
+  file { "/var/cache/local/preseeding/": ensure => directory }
+}