Split classes across files and adding new classes for ruby stuff

4 files changed, 26 insertions, 24 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index b445161..5e0aae1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -416,27 +416,3 @@ class apache {
     refreshonly => true,
   }
 }
-
-class apache::rails inherits apache {
-  package { "mod_rack":
-    name   => "libapache2-mod-passenger",
-    ensure => installed,                                                                                                     
-  }
-
-  # Needed by https://git.codecoop.org/projects/coquelicot
-  package { [ 'libsinatra-ruby1.8', 'libruby1.8',
-              'libhaml-ruby1.8',    'liblockfile-ruby',
-              'libgettext-ruby1.8', 'libjson-ruby1.8' ]:
-    ensure => installed,
-  }
-
-  # Already provided by libruby1.8 package
-  package { 'libopenssl-ruby1.8':
-    ensure => absent,
-  }
-
-  module { "passenger":
-    ensure  => present,
-    require => Package["mod_rack"],
-  }
-}
diff --git a/manifests/passenger.pp b/manifests/passenger.pp
new file mode 100644
index 0000000..92230f0
--- /dev/null
+++ b/manifests/passenger.pp
@@ -0,0 +1,11 @@
+class apache::passenger inherits apache {
+  package { "mod_rack":
+    name   => "libapache2-mod-passenger",
+    ensure => installed,                                                                                                     
+  }
+
+  module { "passenger":
+    ensure  => present,
+    require => Package["mod_rack"],
+  }
+}
diff --git a/manifests/rails.pp b/manifests/rails.pp
new file mode 100644
index 0000000..18667c9
--- /dev/null
+++ b/manifests/rails.pp
@@ -0,0 +1,2 @@
+class apache::rails inherits apache::ruby {
+}
diff --git a/manifests/ruby.pp b/manifests/ruby.pp
new file mode 100644
index 0000000..163eaf6
--- /dev/null
+++ b/manifests/ruby.pp
@@ -0,0 +1,13 @@
+class apache::ruby inherits apache::passenger {
+  # Needed by https://git.codecoop.org/projects/coquelicot
+  package { [ 'libsinatra-ruby1.8', 'libruby1.8',
+              'libhaml-ruby1.8',    'liblockfile-ruby',
+              'libgettext-ruby1.8', 'libjson-ruby1.8' ]:
+    ensure => installed,
+  }
+
+  # Already provided by libruby1.8 package
+  package { 'libopenssl-ruby1.8':
+    ensure => absent,
+  }
+}