Misc updates

diff --git a/manifests/subsystems/utils/network.pp b/manifests/subsystems/utils/network.pp
index 136f1c7847d3be4b7753cb551c032e1fd2da7dc0..1ffd771635195e04d9bc5bf3259c1b6909390b3c 100644 (file)
--- 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 a63548f62e73be1b54032696c1917fbf7610f69e..fe6fb89cf99038d41957c72502190de90b9c6368 100644 (file)
--- 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 08356329ef0ded2a62cc8647e0d2e50149d7f62f..8923ff0ed01ae65ffc7e66bb9e9768a6e831afc9 100644 (file)
--- 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'],
   }