summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-17 16:07:55 -0400
committerMicah Anderson <micah@riseup.net>2013-04-17 16:07:55 -0400
commit6844258b567b5065f5488a12f3f18208ff36ecb0 (patch)
tree57dc2fd942ca81584f85ea7f25ec77a6b845f88e /manifests/init.pp
parentdafb060fc57957dbe9e5e90698537e781cebeaf6 (diff)
parent2f6d7891e115f921c157567e2aa5afd6199c310e (diff)
Merge remote-tracking branch 'shared/master' into leap
Conflicts: manifests/debian.pp
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp29
1 files changed, 14 insertions, 15 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index c6b24a8..574c212 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,31 +6,30 @@
# Marcel Härry haerry+puppet(at)puzzle.ch
# Simon Josi josi+puppet(at)puzzle.ch
#
-# This program is free software; you can redistribute
-# it and/or modify it under the terms of the GNU
-# General Public License version 3 as published by
+# This program is free software; you can redistribute
+# it and/or modify it under the terms of the GNU
+# General Public License version 3 as published by
# the Free Software Foundation.
#
-# Global variables:
-#
-# $apache_default_user: Set this to the user with which the
-# apache is running.
-# $apache_default_group: Set this to the group with which the
-# apache is running.
-class apache {
- case $operatingsystem {
+# manage a simple apache
+class apache(
+ $cluster_node = '',
+ $manage_shorewall = false,
+ $manage_munin = false,
+ $no_default_site = false
+) {
+ case $::operatingsystem {
centos: { include apache::centos }
gentoo: { include apache::gentoo }
- debian: { include apache::debian }
- ubuntu: { include apache::ubuntu }
+ debian,ubuntu: { include apache::debian }
openbsd: { include apache::openbsd }
default: { include apache::base }
}
- if $use_munin {
+ if $apache::manage_munin {
include apache::status
}
- if $use_shorewall {
+ if $apache::manage_shorewall {
include shorewall::rules::http
}
}