diff options
| author | varac <varacanero@zeromail.org> | 2015-10-06 14:32:42 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-10-06 14:32:42 +0200 |
| commit | 70afab799b8cf720cd12bd225c1c2948fd1597ee (patch) | |
| tree | 9cfe2d117de723f519e13908c2a41d09bba6c083 /manifests/apache.pp | |
| parent | 6c3ca97f1524e2b6242c27a2c97dbfb78105889f (diff) | |
| parent | 2cd1b529fc18847712760b15c9412b10d1cee712 (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Conflicts:
manifests/apache.pp
Diffstat (limited to 'manifests/apache.pp')
| -rw-r--r-- | manifests/apache.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/apache.pp b/manifests/apache.pp index f6ec39a..b1da837 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -5,11 +5,11 @@ class nagios::apache( $stored_config = true ) { class{'nagios': - httpd => 'apache', + httpd => 'apache', allow_external_cmd => $allow_external_cmd, - manage_munin => $manage_munin, - manage_shorewall => $manage_shorewall, - stored_config => $stored_config + manage_munin => $manage_munin, + manage_shorewall => $manage_shorewall, + stored_config => $stored_config } case $::operatingsystem { |