diff options
| author | Micah Anderson <micah@riseup.net> | 2013-01-23 11:44:05 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-01-23 11:44:05 -0500 |
| commit | 08c3aa9aaf2cc90cfdee2c8191d83f9cede4bf39 (patch) | |
| tree | c29ec1e86efd6eaa84520b37613d847855cedfe2 /manifests/init.pp | |
| parent | 3a1ebac1ed5c34df90bd174f0f269f2f7ac62974 (diff) | |
| parent | 8fd89115cc15295e20234578b45fdecc8bcf1c70 (diff) | |
Merge remote-tracking branch 'shared/master'
Conflicts:
README
manifests/irc_bot.pp
manifests/irc_bot/base.pp
templates/irc_bot/nsa.cfg.erb
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 12d3db2..5cbd3f3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,6 +14,7 @@ # the Free Software Foundation. # +# manage nagios class nagios( $httpd = 'apache', $allow_external_cmd = false, |