X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=4943c7006eddb6c943b7fed9d8608dd0ac252fbb;hb=e73743d9798dd28bef9565e667300745209b403a;hp=e182139f09d00bbb7b81ad317deb02d117552ff8;hpb=f19274f1bad4b16ca137c7c06f5572e249cdb2a9;p=dsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index e182139f..4943c700 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,104 +1,89 @@
 class debian-org {
    package { "userdir-ldap": ensure => latest;
-             "zsh": ensure => latest;
-             "tcsh": ensure => latest;
-             "pdksh": ensure => latest;
-             "ksh": ensure => latest;
-             "csh": ensure => latest;
-             "ntp": ensure => latest;
-             "locales-all": ensure => latest;
-             "sudo": ensure => latest;
-             "libpam-pwdfile": ensure => latest;
-             "vim": ensure => latest;
-             "gnupg": ensure => latest;
-             "bzip2": ensure => latest;
-             "less": ensure => latest;
-             "ed": ensure => latest;
-             "puppet": ensure => latest;
-             "mtr-tiny": ensure => latest;
-             "nload": ensure => latest;
-             "pciutils": ensure => latest;
-             "dnsutils:": ensure => latest;
-             "bash-completion": ensure => latest;
-             "dsa-nagios-nrpe-config": ensure => latest;
+             "zsh": ensure => installed;
+             "apt-utils": ensure => installed;
+             "tcsh": ensure => installed;
+             "pdksh": ensure => installed;
+             "ksh": ensure => installed;
+             "csh": ensure => installed;
+             "ntp": ensure => installed;
+             "locales-all": ensure => installed;
+             "libpam-pwdfile": ensure => installed;
+             "vim": ensure => installed;
+             "gnupg": ensure => installed;
+             "bzip2": ensure => installed;
+             "less": ensure => installed;
+             "ed": ensure => installed;
+             "puppet": ensure => installed;
+             "mtr-tiny": ensure => installed;
+             "nload": ensure => installed;
+             "pciutils": ensure => installed;
+             "dnsutils": ensure => installed;
+             "bash-completion": ensure => installed;
+             "libfilesystem-ruby1.8": ensure => installed;
    }
    file {
       "/etc/apt/preferences":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/preferences";
       "/etc/apt/sources.list.d/backports.org.list":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/backports.org.list";
-
       "/etc/apt/sources.list.d/debian.org.list":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/debian.org.list";
-
       "/etc/apt/sources.list.d/security.list":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/security.list";
-
       "/etc/apt/sources.list.d/volatile.list":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/volatile.list";
       "/etc/apt/apt.conf.d/local-recommends":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
+      "/etc/apt/apt.conf.d/local-pdiffs":
+             source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
+      "/etc/timezone":
+             source => "puppet:///files/etc/timezone",
+             notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
       "/etc/puppet/puppet.conf":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/puppet/puppet.conf",
              notify  => Exec["puppet reload"];
       "/etc/default/puppet":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/default/puppet",
              notify  => Exec["puppet restart"];
+      case $hostname {
+           spohr: {
+      "/etc/puppet/lib":
+             ensure  => directory,
+             source => "puppet:///files/etc/puppet/lib",
+             recurse => true,
+             notify  => Exec["puppetmaster restart"];
+           }
+           default: {}
+      }
    }
+
    exec { "puppet reload":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
+   exec { "puppetmaster restart":
+             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+             refreshonly => true,
+   }
    exec { "puppet restart":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
+   exec { "dpkg-reconfigure tzdata -pcritical -fnoninteractive":
+           path        => "/usr/bin:/usr/sbin:/bin:/sbin",
+           refreshonly => true,
+        }
 }
 
 class debian-proliant inherits debian-org {
    package {
-      "hpacucli": ensure => latest;
-      "cpqarrayd": ensure => latest;
-      "arrayprobe": ensure => latest;
+      "hpacucli": ensure => installed;
+      "cpqarrayd": ensure => installed;
+      "arrayprobe": ensure => installed;
    }
    file {
       "/etc/apt/sources.list.d/debian.restricted.list":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list";
    }
 }