Not managing /etc/{profile,bash.bashrc} anymore

diff --git a/manifests/subsystem/profile.pp b/manifests/subsystem/profile.pp
index ab1008eee7987c5ac44ab757bbf9dc55457578ff..56190eb890d70040cb090630a848beed84e3e495 100644 (file)
--- a/manifests/subsystem/profile.pp
+++ b/manifests/subsystem/profile.pp
@@ -1,29 +1,11 @@
 # Custom configuration for user profiles
 class nodo::subsystem::profile {
-  # 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 anymore.
-  file { "/etc/profile":
-    source  => [ "puppet:///modules/nodo/etc/profile.${::lsbdistcodename}",
-                 "puppet:///modules/nodo/etc/profile",
-               ],
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    require => File['/usr/local/bin/prompt.sh'],
-  }
-
-  file { "/etc/bash.bashrc":
-    source  => "puppet:///modules/nodo/etc/bash.bashrc",
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    require => File['/usr/local/bin/prompt.sh'],
+  # TODO: remove in the future
+  file { "/usr/local/bin/prompt.sh":
+    ensure  => absent,
   }
 
-  file { "/usr/local/bin/prompt.sh":
+  file { "/etc/profile.d/prompt.sh":
     source  => "puppet:///modules/nodo/bin/prompt.sh",
     owner   => "root",
     group   => "root",
@@ -31,11 +13,6 @@ class nodo::subsystem::profile {
     ensure  => present,
   }
 
-  # This is already being sourced by bash.bashrc.
-  file { "/etc/profile.d/prompt.sh":
-    ensure => absent,
-  }
-
   # See http://linuxforcynics.com/how-to/using-rxvt-unicode-with-screen
   #     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630976
   #     https://bbs.archlinux.org/viewtopic.php?id=50647