summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-09-17 14:13:36 +0200
committermh <mh@immerda.ch>2010-09-17 14:13:36 +0200
commit6c0cb6dd0a83d6f3240c84238a6df5fd1e818664 (patch)
treeb638c98b0734b53b43e217aa463ca9cc4ad2b21e
parent294ae9f0d391890c1acd9b3f69fd24651bd24a97 (diff)
refactor perl module, add speedycgi extenstion
-rw-r--r--manifests/base.pp5
-rw-r--r--manifests/extensions/speedycgi.pp3
-rw-r--r--manifests/init.pp8
-rw-r--r--manifests/module.pp (renamed from manifests/defines.pp)2
4 files changed, 8 insertions, 10 deletions
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/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/defines.pp b/manifests/module.pp
index c4055bd..f9a90d6 100644
--- a/manifests/defines.pp
+++ b/manifests/module.pp
@@ -1,5 +1,3 @@
-# manifests/defines.pp
-
define perl::module (
$ensure = 'present'
) {