From 00572cc15ec050cdcc83d0ba5316927b624e8dab Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 12 Nov 2014 15:31:12 +0200
Subject: [PATCH] puppet: Move ruby-augeas package to ruby module, clean
 obsolete dependencies

---
 puppet/manifests/init.pp | 38 +-------------------------------------
 ruby/manifests/init.pp   | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 34fe847..aa60132 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -30,43 +30,7 @@ class puppet::client {
         default:   { $vardir = "/var/lib/puppet" }
     }
 
-    case $::operatingsystem {
-        "centos","redhat","fedora": {
-            package { "ruby-shadow":
-                ensure => installed,
-            }
-        }
-        "debian": {
-            package { "libaugeas-ruby":
-                ensure => installed,
-                name   => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libaugeas-ruby\1'),
-                before => Service["puppet"],
-            }
-        }
-        "ubuntu": {
-            if versioncmp($::operatingsystemrelease, "13.10") < 0 {
-                $augeas_package = "libaugeas-ruby"
-            } else {
-                $augeas_package = "ruby-augeas"
-            }
-            package { $augeas_package:
-                ensure => installed,
-                before => Service["puppet"],
-            }
-        }
-        "openbsd": {
-            if $::operatingsystemrelease == "4.9" {
-                file { "/etc/rc.d/puppetd":
-                    ensure => present,
-                    source => "puppet:///modules/puppet/puppetd.rc",
-                    mode   => "0755",
-                    owner  => "root",
-                    group  => "wheel",
-                    before => Service["puppet"],
-                }
-            }
-        }
-    }
+    require ruby::augeas
 
     file { "/etc/puppet/puppet.conf":
         ensure  => present,
diff --git a/ruby/manifests/init.pp b/ruby/manifests/init.pp
index fa52d6e..94102bc 100644
--- a/ruby/manifests/init.pp
+++ b/ruby/manifests/init.pp
@@ -57,6 +57,38 @@ class ruby::activerecord {
 }
 
 
+# Install ruby-augeas.
+#
+class ruby::augeas {
+
+    case $::operatingsystem {
+        "openbsd": {
+            if versioncmp($::operatingsystemrelease, "5.6") >= 0 {
+                $package = "ruby20-augeas"
+            } else {
+                $package = "ruby19-augeas"
+            }
+        }
+        "ubuntu": {
+            if versioncmp($::operatingsystemrelease, "13.10") >= 0 {
+                $package = "ruby-augeas"
+            } else {
+                $package = "libaugeas-ruby"
+            }
+        }
+        default: {
+            $package = "ruby-augeas"
+        }
+    }
+
+    package { "ruby-augeas":
+        ensure => installed,
+        name   => $package,
+    }
+
+}
+
+
 # Install mysql ruby bindings.
 #
 class ruby::mysql {