From 6c0cb6dd0a83d6f3240c84238a6df5fd1e818664 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 17 Sep 2010 14:13:36 +0200
Subject: refactor perl module, add speedycgi extenstion

---
 manifests/base.pp                 |  5 +++++
 manifests/defines.pp              | 13 -------------
 manifests/extensions/speedycgi.pp |  3 +++
 manifests/init.pp                 |  8 --------
 manifests/module.pp               | 11 +++++++++++
 5 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 manifests/base.pp
 delete mode 100644 manifests/defines.pp
 create mode 100644 manifests/extensions/speedycgi.pp
 create mode 100644 manifests/module.pp

diff --git a/manifests/base.pp b/manifests/base.pp
new file mode 100644
index 0000000..a689cb1
--- /dev/null
+++ b/manifests/base.pp
@@ -0,0 +1,5 @@
+class perl::base {
+  package{'perl':
+    ensure => installed,
+  }
+}
diff --git a/manifests/defines.pp b/manifests/defines.pp
deleted file mode 100644
index c4055bd..0000000
--- a/manifests/defines.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# manifests/defines.pp
-
-define perl::module (
-    $ensure = 'present'
-) {
-    include perl
-
-    package {"perl-${name}": 
-        ensure => $ensure, 
-        require => Package['perl'],
-    }
-}
-
diff --git a/manifests/extensions/speedycgi.pp b/manifests/extensions/speedycgi.pp
new file mode 100644
index 0000000..d41c9f2
--- /dev/null
+++ b/manifests/extensions/speedycgi.pp
@@ -0,0 +1,3 @@
+class perl::extensions::speedycgi {
+  perl::module{'CGI-SpeedyCGI': }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index 8517831..4c5062a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,16 +5,8 @@
 # Marcel Härry haerry+puppet(at)puzzle.ch
 # Simon Josi josi+puppet(at)puzzle.ch
 
-import 'defines.pp'
-
 class perl {
     case $operatingsystem {
         default: { include perl::base }
     }
 }
-
-class perl::base {
-    package{'perl':
-        ensure => installed,
-    }
-}
diff --git a/manifests/module.pp b/manifests/module.pp
new file mode 100644
index 0000000..f9a90d6
--- /dev/null
+++ b/manifests/module.pp
@@ -0,0 +1,11 @@
+define perl::module (
+    $ensure = 'present'
+) {
+    include perl
+
+    package {"perl-${name}": 
+        ensure => $ensure, 
+        require => Package['perl'],
+    }
+}
+
-- 
cgit v1.2.3