Rewriting profile configuration

1 files changed, 18 insertions, 11 deletions

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index d1ac02c..5094352 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -69,7 +69,7 @@ class nodo {
 
   # As of squeeze, custom configuration can be placed directly at
   # /etc/profile.d, so in the future this file won't need to be
-  # managed by puppet.
+  # managed by puppet anymore.
   file { "/etc/profile":
     source  => [ "puppet://$server/modules/nodo/etc/profile.$lsbdistcodename",
                  "puppet://$server/modules/nodo/etc/profile",
@@ -78,7 +78,7 @@ class nodo {
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    require => File['/usr/local/bin/prompt.sh'],
+    require => File['/etc/profile.d/prompt.sh'],
   }
 
   file { "/etc/bash.bashrc":
@@ -87,24 +87,31 @@ class nodo {
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    require => File['/usr/local/bin/prompt.sh'],
+    require => File['/etc/profile.d/prompt.sh'],
   }
 
   # As of squeeze, custom configuration can be placed directly at
   # /etc/profile.d, so in the future this file has to stay there.
+  #
+  # This change has been backported to lenny via puppet so this
+  # file is not needed anymore.
   file { "/usr/local/bin/prompt.sh":
-    source  => "puppet://$server/modules/nodo/bin/prompt.sh",
-    owner   => "root",
-    group   => "root",
-    mode    => 0755,
-    ensure  => present,
+    ensure => absent,
+  }
+
+  file { "/etc/profile.d":
+    ensure => directory,
+    owner  => "root",
+    group  => "root",
   }
 
-  # Squeeze prompt should be at /etc/profile.d
   file { "/etc/profile.d/prompt.sh":
+    ensure  => present,
+    source  => "puppet://$server/modules/nodo/etc/profile.d/prompt.sh",
     owner   => "root",
     group   => "root",
-    ensure  => "/usr/local/bin/prompt.sh"
-    require => File['/usr/local/bin/prompt.sh'],
+    mode    => 0644,
+    ensure  => present,
+    require => File['/etc/profile.d'],
   }
 }