X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=d56db42adac49e9ac4980dd8bb134da69362ca6d;hb=48a3a428720178800872ce1648104496cf252eaf;hp=fb5540e69793d9ef3019f6889b9911c4402e59a4;hpb=a1ffa958a48f4d4fd130df3fe415657cf7d5b6b4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index fb5540e69..d56db42ad 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -9,6 +9,13 @@ define sysctl($key, $value, $ensure=present) {
     }
 }
 
+define set_alternatives($linkto) {
+        exec { "/usr/sbin/update-alternatives --set $name $linkto":
+            unless => "/bin/sh -c '! [ -e $linkto ] || ! [ -e /etc/alternatives/$name ] || ([ -L /etc/alternatives/$name ] && [ /etc/alternatives/$name -ef $linkto ])'"
+        }
+}
+
+
 class debian-org {
    package { "userdir-ldap": ensure => installed;
              "zsh": ensure => installed;
@@ -42,16 +49,16 @@ class debian-org {
       "/etc/apt/preferences":
              source => "puppet:///files/etc/apt/preferences";
       "/etc/apt/sources.list.d/backports.org.list":
-             source => "puppet:///files/etc/apt/sources.list.d/backports.org.list",
+             content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"),
              notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/debian.org.list":
-             source => "puppet:///files/etc/apt/sources.list.d/debian.org.list",
+             content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
              notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/security.list":
-             source => "puppet:///files/etc/apt/sources.list.d/security.list",
+             content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
              notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/volatile.list":
-             source => "puppet:///files/etc/apt/sources.list.d/volatile.list",
+             content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
              notify  => Exec["apt-get update"];
       "/etc/apt/apt.conf.d/local-recommends":
              source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
@@ -61,17 +68,21 @@ class debian-org {
              source => "puppet:///files/etc/timezone",
              notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
       "/etc/puppet/puppet.conf":
+             require => Package["puppet"],
              source => "puppet:///files/etc/puppet/puppet.conf"
              ;
       "/etc/default/puppet":
+             require => Package["puppet"],
              source => "puppet:///files/etc/default/puppet"
              ;
 
       "/etc/syslog-ng/syslog-ng.conf":
-             source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
+             content => template("syslog-ng.conf.erb"),
+             require => Package["syslog-ng"],
              notify  => Exec["syslog-ng reload"],
              ;
       "/etc/logrotate.d/syslog-ng":
+             require => Package["syslog-ng"],
              source => "puppet:///files/etc/logrotate.d/syslog-ng",
              ;
       "/etc/cron.d/dsa-puppet-stuff":
@@ -79,9 +90,11 @@ class debian-org {
              require => Package["cron"]
              ;
       "/etc/ldap/ldap.conf":
+             require => Package["userdir-ldap"],
              source => "puppet:///files/etc/ldap/ldap.conf",
              ;
       "/etc/pam.d/common-session":
+             require => Package["libpam-pwdfile"],
              source => "puppet:///files/etc/pam.d/common-session",
              ;
    }
@@ -105,6 +118,10 @@ class debian-org {
              value       => 4096,
    }
 
+   set_alternatives { "editor":
+           linkto => "/usr/bin/vim.basic",
+   }
+
    exec { "syslog-ng reload":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
@@ -136,7 +153,7 @@ class debian-proliant inherits debian-org {
    }
    file {
       "/etc/apt/sources.list.d/debian.restricted.list":
-             source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list",
+             content => template("debian-org/etc/apt/sources.list.d/debian.restricted.list.erb"),
              notify  => Exec["apt-get update"];
    }
 }