aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-29 22:01:58 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-29 22:01:58 -0200
commit794e890b4d991be1b7cdf030b90f6bc34764b6b8 (patch)
tree3ce83fb1f0b8aa19a27cc3338f43255bd6ae1e08
parent551624d8e801f05cd68e0f9f39f05de2b5eb3ef4 (diff)
downloadpuppet-nodo-794e890b4d991be1b7cdf030b90f6bc34764b6b8.tar.gz
puppet-nodo-794e890b4d991be1b7cdf030b90f6bc34764b6b8.tar.bz2
Misc updates
-rw-r--r--manifests/subsystems/utils/network.pp6
-rw-r--r--manifests/subsystems/utils/personal.pp2
-rw-r--r--manifests/subsystems/utils/ruby.pp5
3 files changed, 8 insertions, 5 deletions
diff --git a/manifests/subsystems/utils/network.pp b/manifests/subsystems/utils/network.pp
index 136f1c7..1ffd771 100644
--- a/manifests/subsystems/utils/network.pp
+++ b/manifests/subsystems/utils/network.pp
@@ -42,7 +42,7 @@ class utils::network inherits utils::network::minimal {
}
# Squeeze (or newer) packages
- if $lsbdistcodename != 'lenny' {
+ if $::lsbdistcodename != 'lenny' {
package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
'maildir-utils', 'icedtea6-plugin', 'xul-ext-adblock-plus',
'xul-ext-noscript', 'xul-ext-firebug' ]:
@@ -61,7 +61,7 @@ class utils::network inherits utils::network::minimal {
}
# Wheezy (or newer) packages
- if $lsbdistcodename != 'squeeze' {
+ if $::lsbdistcodename != 'squeeze' {
package { [ 'xul-ext-pentadactyl', 'xul-ext-https-everywhere', 'xul-ext-certificatepatrol',
'xul-ext-cookie-monster', 'xul-ext-refcontrol', 'xul-ext-quickproxy',
'xul-ext-requestpolicy' ]:
@@ -75,7 +75,7 @@ class utils::network inherits utils::network::minimal {
# Lenny only
package { [ 'mozilla-firefox-adblock' ]:
- ensure => $lsbdistcodename ? {
+ ensure => $::lsbdistcodename ? {
'lenny' => present,
default => absent,
},
diff --git a/manifests/subsystems/utils/personal.pp b/manifests/subsystems/utils/personal.pp
index a63548f..fe6fb89 100644
--- a/manifests/subsystems/utils/personal.pp
+++ b/manifests/subsystems/utils/personal.pp
@@ -1,6 +1,6 @@
# Common utilities for personal
class utils::personal {
- case $operatingsystem {
+ case $::operatingsystem {
debian: {
include utils::personal::debian
}
diff --git a/manifests/subsystems/utils/ruby.pp b/manifests/subsystems/utils/ruby.pp
index 0835632..8923ff0 100644
--- a/manifests/subsystems/utils/ruby.pp
+++ b/manifests/subsystems/utils/ruby.pp
@@ -2,7 +2,10 @@ class utils::ruby {
# Gem packages
package { 'capistrano':
ensure => installed,
- provider => gem,
+ provider => $::lsbdistcodename ? {
+ 'squeeze' => gem,
+ default => apt,
+ },
require => Package['rubygems'],
}