diff options
| -rw-r--r-- | files/bin/prompt.sh (renamed from files/etc/profile.d/prompt.sh) | 0 | ||||
| -rw-r--r-- | files/etc/bash.bashrc | 1 | ||||
| -rw-r--r-- | manifests/subsystems/profile.pp | 27 |
3 files changed, 8 insertions, 20 deletions
diff --git a/files/etc/profile.d/prompt.sh b/files/bin/prompt.sh index 85d7bff..85d7bff 100644 --- a/files/etc/profile.d/prompt.sh +++ b/files/bin/prompt.sh diff --git a/files/etc/bash.bashrc b/files/etc/bash.bashrc index 89b5a57..22d06b1 100644 --- a/files/etc/bash.bashrc +++ b/files/etc/bash.bashrc @@ -47,4 +47,3 @@ if [ -x /usr/lib/command-not-found ]; then fi . /usr/local/bin/prompt.sh -PROMPT_COMMAND="command_prompt" diff --git a/manifests/subsystems/profile.pp b/manifests/subsystems/profile.pp index d09f7a6..e49e3b5 100644 --- a/manifests/subsystems/profile.pp +++ b/manifests/subsystems/profile.pp @@ -19,7 +19,7 @@ class profile { group => "root", mode => 0644, ensure => present, - require => File['/etc/profile.d/prompt.sh'], + require => File['/usr/local/bin/prompt.sh'], } file { "/etc/bash.bashrc": @@ -28,30 +28,19 @@ class profile { group => "root", mode => 0644, ensure => present, - require => File['/etc/profile.d/prompt.sh'], + require => File['/usr/local/bin/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": - ensure => absent, - } - - file { "/etc/profile.d": - ensure => directory, - owner => "root", - group => "root", - } - - file { "/etc/profile.d/prompt.sh": - source => "puppet://$server/modules/nodo/etc/profile.d/prompt.sh", + source => "puppet://$server/modules/nodo/bin/prompt.sh", owner => "root", group => "root", mode => 0644, ensure => present, - require => File['/etc/profile.d'], + } + + # This is already being sourced by bash.bashrc. + file { "/etc/profile.d/prompt.sh": + ensure => absent, } } |