aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-18 19:52:54 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-18 19:52:54 -0200
commit4a7c7172e8725ce72df93924c4a4dcd87f75a569 (patch)
tree3807f1b23a998730d2318f5f914539e22a45488c /manifests
parent316cbdfd3dff6596dcfe4dfbf60c2f278d8d6be8 (diff)
downloadpuppet-nodo-4a7c7172e8725ce72df93924c4a4dcd87f75a569.tar.gz
puppet-nodo-4a7c7172e8725ce72df93924c4a4dcd87f75a569.tar.bz2
Updating profile to squeeze
Diffstat (limited to 'manifests')
-rw-r--r--manifests/nodo.pp17
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'],
+ }
}