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

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 890a238..da89852 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -26,7 +26,7 @@ class buildd {
              ;
         "/etc/cron.d/dsa-buildd":
              source => "puppet:///modules/buildd/cron.d-dsa-buildd",
-             require => Package["cron"]
+             require => Package["debian.org"]
              ;
         "/etc/dupload.conf":
              source => "puppet:///modules/buildd/dupload.conf",

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 48843f9..37494c7 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -42,20 +42,17 @@ class debian-org {
     package {
         "apt-utils": ensure => installed;
         "bash-completion": ensure => installed;
-        "cron": ensure => installed;
         "debian.org": ensure => installed;
         "dnsutils": ensure => installed;
         "dsa-munin-plugins": ensure => installed;
         "klogd": ensure => purged;
         "less": ensure => installed;
-        "logrotate": ensure => installed;
         "libfilesystem-ruby1.8": ensure => installed;
         "mtr-tiny": ensure => installed;
         "nload": ensure => installed;
         "pciutils": ensure => installed;
         "rsyslog": ensure => purged;
         "sysklogd": ensure => purged;
-        "userdir-ldap": ensure => installed;
     }
     file {
         "/etc/apt/preferences":
@@ -90,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":

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 71964c4..a6dcf1e 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -60,7 +60,7 @@ class ferm {
             notify  => Exec["ferm restart"];
         "/etc/logrotate.d/ulogd":
             source => "puppet:///modules/ferm/logrotate-ulogd",
-            require => Package["logrotate"],
+            require => Package["debian.org"],
             ;
     }
 

diff --git a/modules/rsyncd-log/manifests/init.pp b/modules/rsyncd-log/manifests/init.pp
index ca3c4f7..28e3c78 100644 (file)
--- a/modules/rsyncd-log/manifests/init.pp
+++ b/modules/rsyncd-log/manifests/init.pp
@@ -2,7 +2,7 @@ class rsyncd-log {
     file {
         "/etc/logrotate.d/dsa-rsyncd":
             source  => "puppet:///modules/rsyncd-log/logrotate.d-dsa-rsyncd",
-            require => Package["logrotate"],
+            require => Package["debian.org"],
             ;
         "/var/log/rsyncd":
             ensure  => directory,