Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  start replacing removed package references with references to debian.org package
  oops, need this one.  Put it back as well
  oops, need this one.  Put it back as well
  oops, need this one.  Put it back as well
  oops, need this one.  Put it back in the right module
  add debian.org to manifest and remove a bunch of stuff it depends on
  directory wants package installed first
  pescetti to squeeze

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 75bb70d..37494c7 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -42,31 +42,17 @@ 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":
@@ -101,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/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 9e1a252..003166d 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -260,6 +260,7 @@ host_settings:
     - morricone.debian.org
     - murphy.debian.org
     - nono.debian.org
+    - pescetti.debian.org
     - pergolesi.debian.org
     - pettersson.debian.org
     - piatti.debian.org

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,

diff --git a/modules/syslog-ng/manifests/init.pp b/modules/syslog-ng/manifests/init.pp
index 7706c78..b1490d9 100644 (file)
--- a/modules/syslog-ng/manifests/init.pp
+++ b/modules/syslog-ng/manifests/init.pp
@@ -1,4 +1,8 @@
 class syslog-ng {
+    package {
+        "syslog-ng": ensure => installed;
+    }
+
     file {
         "/etc/syslog-ng/syslog-ng.conf":
             content => template("syslog-ng/syslog-ng.conf.erb"),

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index 6c58a7d..f01b7fd 100644 (file)
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -14,6 +14,7 @@ class unbound {
             ensure  => directory,
             owner   => unbound,
             group   => unbound,
+            require => Package["unbound"],
             mode    => 775,
             ;
         "/var/lib/unbound/root.key":