summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-07-26 15:21:59 +0000
committermh <mh@immerda.ch>2008-07-26 15:21:59 +0000
commitd6a3b141488165e350359207a5b4b63a305b27ce (patch)
tree7ef63cd364d5d27f47ef3b7cc27653c9f6679f96 /manifests/init.pp
parentf6d135d7e52f27d2dadad243417d81da62f3f347 (diff)
factered out the modules of the apache module
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp17
1 files changed, 1 insertions, 16 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 81ec9e9..62bb122 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,8 +3,6 @@
# adapted by Puzzle ITC - haerry+puppet(at)puzzle.ch
# License: GPLv3
-import "modules/*.pp"
-
class apache {
case $operatingsystem {
centos: { include apache::centos }
@@ -159,12 +157,6 @@ class apache::openbsd inherits apache::base {
}
}
-# extended apache configs
-class apache::security inherits apache {
- include apache::mod_security
-}
-
-
### config things
define apache::vhost::file(
$source = '',
@@ -283,15 +275,8 @@ define apache::config::file(
}
}
-#php
class apache::php inherits apache {
- case $operatingsystem {
- debian: { include php::debian }
- centos: { include php::centos }
- ubuntu: { include php::ubuntu }
- gentoo: { include php::gentoo }
- default: { include php::base }
- }
+ include php
}
class apache::status {