start replacing removed package references with references to debian.org package

[mirror/dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 1e23846..37494c7 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -17,36 +17,42 @@ define set_alternatives($linkto) {
         }
 }
 
+define linux_module ($ensure) {
+    case $ensure {
+        present: {
+            exec { "append_module_${name}":
+                command => "echo '${name}' >> /etc/modules",
+                unless => "grep -q -F -x '${name}' /etc/modules",
+            }
+        }
+        absent: {
+            exec { "remove_module_${name}":
+                command => "sed -i -e'/^${name}\$/d' /etc/modules",
+                onlyif => "grep -q -F -x '${name}' /etc/modules",
+            }
+        }
+        default: {
+             err("invalid ensure value ${ensure}")
+         }
+    }
+}
+
 
 class debian-org {
     package {
         "apt-utils": ensure => installed;
         "bash-completion": ensure => installed;
-        "bzip2": ensure => installed;
-        "cron": ensure => installed;
-        "csh": ensure => installed;
+        "debian.org": ensure => installed;
         "dnsutils": ensure => installed;
         "dsa-munin-plugins": ensure => installed;
-        "ed": ensure => installed;
-        "gnupg": ensure => installed;
         "klogd": ensure => purged;
-        "ksh": ensure => installed;
         "less": ensure => installed;
         "libfilesystem-ruby1.8": ensure => installed;
-        "libpam-pwdfile": ensure => installed;
-        "locales-all": ensure => installed;
         "mtr-tiny": ensure => installed;
         "nload": ensure => installed;
         "pciutils": ensure => installed;
-        "pdksh": ensure => installed;
         "rsyslog": ensure => purged;
         "sysklogd": ensure => purged;
-        "syslog-ng": ensure => installed;
-        "tcsh": ensure => installed;
-        "userdir-ldap": ensure => installed;
-        "vim": ensure => installed;
-        "zsh": ensure => installed;
-        "logrotate": ensure => installed;
     }
     file {
         "/etc/apt/preferences":
@@ -81,14 +87,14 @@ class debian-org {
 
         "/etc/cron.d/dsa-puppet-stuff":
             source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron",
-            require => Package["cron"]
+            require => Package["debian.org"]
             ;
         "/etc/ldap/ldap.conf":
-            require => Package["userdir-ldap"],
+            require => Package["debian.org"],
             source => "puppet:///modules/debian-org/ldap.conf",
             ;
         "/etc/pam.d/common-session":
-            require => Package["libpam-pwdfile"],
+            require => Package["debian.org"],
             content => template("debian-org/pam.common-session.erb"),
             ;
         "/etc/rc.local":