diff options
Diffstat (limited to 'manifests/nodo.pp')
| -rw-r--r-- | manifests/nodo.pp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/manifests/nodo.pp b/manifests/nodo.pp index 6faff95..d1ac02c 100644 --- a/manifests/nodo.pp +++ b/manifests/nodo.pp @@ -67,8 +67,13 @@ class nodo { ensure => present, } + # 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. file { "/etc/profile": - source => "puppet://$server/modules/nodo/etc/profile", + source => [ "puppet://$server/modules/nodo/etc/profile.$lsbdistcodename", + "puppet://$server/modules/nodo/etc/profile", + ], owner => "root", group => "root", mode => 0644, @@ -85,6 +90,8 @@ class nodo { 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. file { "/usr/local/bin/prompt.sh": source => "puppet://$server/modules/nodo/bin/prompt.sh", owner => "root", @@ -92,4 +99,12 @@ class nodo { mode => 0755, ensure => present, } + + # Squeeze prompt should be at /etc/profile.d + file { "/etc/profile.d/prompt.sh": + owner => "root", + group => "root", + ensure => "/usr/local/bin/prompt.sh" + require => File['/usr/local/bin/prompt.sh'], + } } |