more os changes

shared/additional-modules/ruby/manifests/debian.pp

@@ -1,17 +0,0 @@
-class ruby::debian($version) {
-  $packages = [
-    'libyaml-dev', 'libreadline-dev', 'libssl-dev', 'libffi-dev',
-    'libncurses5-dev', 'libcurl4-openssl-dev', 'zlib1g-dev',
-    'libxml2', 'libxml2-dev', 'libxslt1.1', 'libxslt1-dev'
-  ]
-
-  package { $packages: ensure => installed }
-
-  class { ruby: version => $version, require => Package[$packages] }
-
-  bash_rc_d { 'ruby':
-    ensure => present,
-    path => $base::local_path
-  }
-}
-

shared/additional-modules/ruby/manifests/init.pp

@@ -9,6 +9,25 @@ class ruby($version, $configure = "--disable-install-doc", $build_path = '') {
     path => "${base::path}:${path}:${build_path}"
   }
 
+  if ($osfamily == 'debian') {
+    $packages = [
+      'libyaml-dev', 'libreadline-dev', 'libssl-dev', 'libffi-dev',
+      'libncurses5-dev', 'libcurl4-openssl-dev', 'zlib1g-dev',
+      'libxml2', 'libxml2-dev', 'libxslt1.1', 'libxslt1-dev'
+    ]
+
+    package { $packages:
+      ensure => installed,
+      before => Build_and_install[$name]
+    }
+
+    bash_rc_d { 'ruby':
+      ensure => present,
+      path => $base::local_path,
+      require => Build_and_install[$name]
+    }
+  }
+
   gem { [ 'bundler', 'penchant' ]:
     require => Build_and_install[$name],
     path => $with_ruby_path,

shared/additional-modules/varnish/manifests/init.pp

@@ -62,7 +62,7 @@ class varnish($version, $vcl, $user = 'varnish', $group = 'varnish', $store_file
   }
 
   /* debian stuff */
-  if ($osfamily == 'debian') {
+  if ($::osfamily == 'debian') {
     user { $user: uid => 27835 }
 
     $packages = [ 'libpcre3', 'libpcre3-dev', 'pkg-config' ]