X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=37c98fb0adf67fa4b14431ea8126a9532d29b919;hb=930c30d7e60f474908e27fd12429353ee7c226fa;hp=b659237fe5616d827f9022430cb1bfef3ffcdeb4;hpb=39462328aa5f1f2358c275c85f2026830bd4fcfc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index b659237fe..37c98fb0a 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,105 +1,128 @@
 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;
-             "libfilesystem-ruby1.8": ensure => latest;
+   package { "userdir-ldap": ensure => installed;
+             "zsh": ensure => installed;
+             "cron": 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;
+             "syslog-ng": ensure => installed;
+             "sysklogd": ensure => purged;
+             "klogd": ensure => purged;
+             "rsyslog": ensure => purged;
    }
    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";
-
+             source => "puppet:///files/etc/apt/sources.list.d/backports.org.list",
+             notify  => Exec["apt-get update"];
       "/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";
-
+             source => "puppet:///files/etc/apt/sources.list.d/debian.org.list",
+             notify  => Exec["apt-get update"];
       "/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";
-
+             source => "puppet:///files/etc/apt/sources.list.d/security.list",
+             notify  => Exec["apt-get update"];
       "/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";
+             source => "puppet:///files/etc/apt/sources.list.d/volatile.list",
+             notify  => Exec["apt-get update"];
       "/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"];
+             require => Exec["puppet stop"];
+
+      "/etc/syslog-ng/syslog-ng.conf":
+             source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
+             notify  => Exec["syslog-ng reload"],
+             ;
+      "/etc/logrotate.d/syslog-ng":
+             source => "puppet:///files/etc/logrotate.d/syslog-ng",
+             ;
+      "/etc/cron.d/dsa-puppet-stuff":
+             source => "puppet:///files/etc/cron.d/dsa-puppet-stuff",
+             require => Package["cron"]
+             ;
+      "/etc/ldap/ldap.conf":
+             source => "puppet:///files/etc/ldap/ldap.conf",
+             ;
+      "/etc/pam.d/common-session":
+             source => "puppet:///files/etc/pam.d/common-session",
+             ;
    }
+   case $hostname {
+        handel: {
+            file {
+               "/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 { "puppet restart":
+   exec { "puppetmaster restart":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
+   exec { "puppet stop":
+             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+             refreshonly => true,
+   }
+   exec { "syslog-ng reload":
+             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,
+   }
+   exec { "apt-get update":
+             command => 'apt-get update',
+             path        => "/etc/init.d:/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";
+             source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list",
+             notify  => Exec["apt-get update"];
    }
 }