diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-12 13:23:29 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-12 14:37:28 -0400 |
| commit | 115691c87bad3f5863f088e73603133b67c9f828 (patch) | |
| tree | bbfd7b5c0d0c220ef3e52eb25acd4595a46b85d0 /manifests/init.pp | |
| parent | 2401aae6c4785c1e6a777756bebe70c38b889727 (diff) | |
| parent | 5ec141dfbf218dd9b2f2611d788db98f74e65073 (diff) | |
Merge remote-tracking branch 'immerda/master'
Fixed apache_no_default_site variable to be a parameter to the apache
class (no_default_site = false)
Conflicts:
files/include.d/Debian/ssl_defaults.inc
manifests/base.pp
manifests/config/file.pp
manifests/vhost.pp
manifests/vhost/php/standard.pp
manifests/vhost/template.pp
templates/vhosts/php/CentOS.erb
templates/vhosts/php/Debian.erb
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 29 |
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 } } |